MonetDB: Mar2011 - Don't use extra functions just for assertions.

[Sjoerd Mullender]

Changeset: 10b464b0c6ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10b464b0c6ba
Modified Files:
        gdk/gdk.mx
        gdk/gdk_bat.mx
Branch: Mar2011
Log Message:

Don't use extra functions just for assertions.


diffs (56 lines):

diff --git a/gdk/gdk.mx b/gdk/gdk.mx
--- a/gdk/gdk.mx
+++ b/gdk/gdk.mx
@@ -1580,26 +1580,13 @@
        return bi;
 }
 
-#define BUNfirst(b)    ((b)->batFirst)
-#ifdef NDEBUG
-#define BUNlast(b)     ((b)->batFirst + (b)->batCount)
-#else
-static inline BUN
-BUNlast(BAT *b)
-{
-       BUN last;
-
-       assert(b->batFirst <= BUN_MAX);
-       assert(b->batCount <= BUN_MAX);
-       last = b->batFirst + b->batCount;
-       assert(last <= BUN_MAX);
-       return (BUN) last;
-}
-#endif
-
-#ifdef NDEBUG
+#define BUNfirst(b)    (assert((b)->batFirst <= BUN_MAX), (b)->batFirst)
+#define BUNlast(b)     (assert((b)->batFirst <= BUN_MAX),              \
+                        assert((b)->batCount <= BUN_MAX),              \
+                        assert((b)->batCount <= BUN_MAX - (b)->batFirst), \
+                        (b)->batFirst + (b)->batCount)
+
 #define BATcount(b)    ((b)->batCount)
-#endif
 
 /*
 @
diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx
--- a/gdk/gdk_bat.mx
+++ b/gdk/gdk_bat.mx
@@ -2224,16 +2224,6 @@
 BUN list.
 @{
 @c
-#ifdef BATcount                        /* may be defined in gdh.mx */
-#undef BATcount
-#endif
-BUN
-BATcount(BAT *b)
-{
-       BATcheck(b, "BATcount");
-       return b->batCount;
-}
-
 void
 BATsetcapacity(BAT *b, BUN cnt)
 {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list