Changeset: 330f4999b9b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=330f4999b9b7
Modified Files:
gdk/gdk.h
Branch: default
Log Message:
Simplify macros a bit.
diffs (18 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1312,10 +1312,10 @@ gdk_export BUN BUNfnd(BAT *b, const void
} while (0)
#define BUNfndSTD(p,bi,v) ((p) = BUNfnd(bi.b,v))
-#define BAThtype(b) ((b)->htype == TYPE_void && (b)->hseqbase == oid_nil ?\
- TYPE_void : ATOMtype((b)->htype))
-#define BATttype(b) ((b)->ttype == TYPE_void && (b)->tseqbase == oid_nil ?\
- TYPE_void : ATOMtype((b)->ttype))
+#define BAThtype(b) ((b)->htype == TYPE_void && (b)->hseqbase != oid_nil ? \
+ TYPE_oid : (b)->htype)
+#define BATttype(b) ((b)->ttype == TYPE_void && (b)->tseqbase != oid_nil ? \
+ TYPE_oid : (b)->ttype)
#define BAThstore(b) (BAThdense(b) ? TYPE_void : (b)->htype)
#define BATtstore(b) (BATtdense(b) ? TYPE_void : (b)->ttype)
#define Hbase(b) ((b)->H->vheap->base)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
