traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make vector.h compile when included by C++, w/o clang extensions

Browse source
This commit is contained in:
Max Brunsfeld 2015-11-20 00:07:05 -08:00
parent c88e9044d5
commit ee66f1e774
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/runtime/vector.h
View file

@ -17,12 +17,12 @@ typedef struct {
} Vector;
static inline Vector vector_new(size_t element_size, size_t capacity) {
return (Vector){
.contents = malloc(capacity * element_size),
.size = 0,
.capacity = capacity,
.element_size = element_size,
};
Vector result;
result.contents = malloc(capacity * element_size);
result.size = 0;
result.capacity = capacity;
result.element_size = element_size;
return result;
}
static inline void vector_delete(Vector *self) {
@ -79,13 +79,10 @@ static inline void vector_reverse(Vector *self) {
}
static inline Vector vector_copy(Vector *self) {
return (Vector){
.contents = memcpy(malloc(self->capacity * self->element_size),
self->contents, self->size * self->element_size),
.size = self->size,
.capacity = self->capacity,
.element_size = self->element_size,
};
Vector copy = *self;
copy.contents = memcpy(malloc(self->capacity * self->element_size),
self->contents, self->size * self->element_size);
return copy;
}
#ifdef __cplusplus