Changeset: 2e3ad4953bae for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2e3ad4953bae
Modified Files:
gdk/gdk_utils.c
Branch: resource_management
Log Message:
try to make make MSVC happy
diffs (54 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -2125,28 +2125,30 @@ static void
sa_free_blk(allocator *pa, void *blk)
{
// free blks are maintained on the root allocator
- if (pa->pa)
- return sa_free_blk(pa->pa, blk);
- assert(!pa->pa); // must be root allocator
- size_t i;
+ if (pa->pa) {
+ sa_free_blk(pa->pa, blk);
+ } else {
+ // assert(!pa->pa); // must be root allocator
+ size_t i;
- for(i = 0; i < pa->nr; i++) {
- if (pa->blks[i] == blk)
- break;
- }
- assert (i < pa->nr);
+ for(i = 0; i < pa->nr; i++) {
+ if (pa->blks[i] == blk)
+ break;
+ }
+ assert (i < pa->nr);
- size_t sz = GDKmallocated(blk);
- if (sz > (SA_BLOCK_SIZE)) {
- GDKfree(blk);
- for (; i < pa->nr-1; i++)
- pa->blks[i] = pa->blks[i+1];
- pa->nr--;
- } else {
- freed_t *f = blk;
- f->n = pa->freelist_blks;
- f->sz = sz;
- pa->freelist_blks = f;
+ size_t sz = GDKmallocated(blk);
+ if (sz > (SA_BLOCK_SIZE)) {
+ GDKfree(blk);
+ for (; i < pa->nr-1; i++)
+ pa->blks[i] = pa->blks[i+1];
+ pa->nr--;
+ } else {
+ freed_t *f = blk;
+ f->n = pa->freelist_blks;
+ f->sz = sz;
+ pa->freelist_blks = f;
+ }
}
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
