Changeset: 0d921a7646b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d921a7646b4
Modified Files:
gdk/gdk.h
gdk/gdk_private.h
Branch: default
Log Message:
Fix changeset 855086e7f52e.
diffs (64 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3251,26 +3251,6 @@ gdk_export BAT *BATsample(BAT *b, BUN n)
BATkdiff(_l, _r); \
})
-#define BATmaterializeh(b) \
- ({ \
- BAT *_b = (b), *_r = (r); \
- HEADLESSDEBUG fprintf(stderr, \
- "#BATmaterializeh([%s,%s]#"BUNFMT") %s[%s:%d]\n", \
- _COL_TYPE(_b->H), _COL_TYPE(_b->T), BATcount(_b), \
- __func__, __FILE__, __LINE__); \
- BATmaterializeh(_b); \
- })
-
-#define BATmaterialize(b) \
- ({ \
- BAT *_b = (b), *_r = (r); \
- HEADLESSDEBUG fprintf(stderr, \
- "#BATmaterialize([%s,%s]#"BUNFMT") %s[%s:%d]\n", \
- _COL_TYPE(_b->H), _COL_TYPE(_b->T), BATcount(_b), \
- __func__, __FILE__, __LINE__); \
- BATmaterialize(_b); \
- })
-
#endif
#endif
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -429,3 +429,30 @@ GDKreallocmax_debug(void *ptr, size_t si
#define GDKreallocmax(p, s, ps, e) GDKreallocmax_debug((p), (s), (ps),
(e), __FILE__, __LINE__)
#endif
#endif
+
+#ifndef NDEBUG
+#ifdef __GNUC__
+/* in debug builds, complain (warn) about usage of legacy functions */
+
+#define BATmaterializeh(b) \
+ ({ \
+ BAT *_b = (b); \
+ HEADLESSDEBUG fprintf(stderr, \
+ "#BATmaterializeh([%s,%s]#"BUNFMT") %s[%s:%d]\n", \
+ _COL_TYPE(_b->H), _COL_TYPE(_b->T), BATcount(_b), \
+ __func__, __FILE__, __LINE__); \
+ BATmaterializeh(_b); \
+ })
+
+#define BATmaterialize(b) \
+ ({ \
+ BAT *_b = (b); \
+ HEADLESSDEBUG fprintf(stderr, \
+ "#BATmaterialize([%s,%s]#"BUNFMT") %s[%s:%d]\n", \
+ _COL_TYPE(_b->H), _COL_TYPE(_b->T), BATcount(_b), \
+ __func__, __FILE__, __LINE__); \
+ BATmaterialize(_b); \
+ })
+
+#endif
+#endif
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
