Changeset: 718da8ca0a1a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=718da8ca0a1a
Modified Files:
gdk/gdk.h
Branch: headless
Log Message:
Add another cast to convert the (now) void* base pointer to char*.
Also use (b)->vheap->base internally instead of COLbase(b).
diffs (21 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1470,7 +1470,7 @@
#define BUNloc(bi,p) COLelement((bi).b,p)
#define BUNpos(bi,p) ((bi).vid = (bi).b->seqbase + ((bi).b->seqbase ==
oid_nil ? 0 : (p) - (bi).b->first), (char *) &(bi).vid)
-#define BUNvar(bi,p)
((bi).b->type?((char*)COLbase((bi).b)+BUNvaroff(bi,p)):BUNpos(bi,p))
+#define BUNvar(bi,p)
((bi).b->type?((char*)(bi).b->vheap->base+BUNvaroff(bi,p)):BUNpos(bi,p))
#define BUNhead(bi,p) ((bi).b->varsized?BUNvar(bi,p):BUNloc(bi,p))
static inline COLiter
@@ -3027,7 +3027,7 @@
for(q = COLlast(r), p = COLfirst(r);p < q; p++)
#define COLforloop(b,o) for( o = 0; o < b->count; o++)
-#define COLgetString(b,o) (str)(COLbase(b) + ((size_t)
VarHeapValRaw(b,o,b->width) << GDK_VARSHIFT))
+#define COLgetString(b,o) (str)((char *) (b)->vheap->base + ((size_t)
VarHeapValRaw(b,o,b->width) << GDK_VARSHIFT))
gdk_export str COLputString(COL *b, oid o, str v);
/*
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
