projects
/
cgds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed mistake in test/makemain.sh ; still vector_pop_first to fix in src/Vector.c
[cgds.git]
/
src
/
Vector.c
diff --git
a/src/Vector.c
b/src/Vector.c
index
a303d54
..
cf45cb9
100644
(file)
--- a/
src/Vector.c
+++ b/
src/Vector.c
@@
-85,9
+85,17
@@
void vector_pop(Vector* vector)
void vector_pop_first(Vector* vector)
{
safe_free(vector->datas[0]);
void vector_pop_first(Vector* vector)
{
safe_free(vector->datas[0]);
- vector->datas++;
+
+
+ //HACK: next 3 lines move vector head
+ void** nextDatas = vector->datas + 1;
+ safe_free(vector->datas);
+ vector->datas = nextDatas;
+//but memory can then be reallocated : TODO
+
+
vector->size--;
vector->size--;
- if (vector
_size(vector)
<= (vector->capacity >> 1))
+ if (vector
->size
<= (vector->capacity >> 1))
_vector_realloc(vector, vector->capacity >> 1);
}
_vector_realloc(vector, vector->capacity >> 1);
}