Changeset: 07e38066a1d3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07e38066a1d3
Modified Files:
gdk/gdk.h
Branch: default
Log Message:
Extended changeset f80f0ede832d to new bunfastapp macro.
diffs (29 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1329,7 +1329,7 @@ gdk_export bte ATOMelmshift(int sz);
register BUN _p = BUNlast(b); \
if (_p >= BATcapacity(b)) { \
if (_p == BUN_MAX || BATcount(b) == BUN_MAX) { \
- GDKerror("bunfastins: too many elements to
accomodate (INT_MAX)\n"); \
+ GDKerror("bunfastins: too many elements to
accomodate (BUN_MAX)\n"); \
goto bunins_failed; \
} \
if (BATextend((b), BATgrows(b)) == NULL) \
@@ -1348,11 +1348,11 @@ gdk_export bte ATOMelmshift(int sz);
do { \
register BUN _p = BUNlast(b); \
assert((b)->htype == TYPE_void); \
- if (_p == BUN_MAX || BATcount(b) == BUN_MAX) { \
- GDKerror("bunfastapp: too many elements to accomodate
(INT_MAX)\n"); \
- goto bunins_failed; \
- } \
- if (_p + 1 > BATcapacity(b)) { \
+ if (_p >= BATcapacity(b)) { \
+ if (_p == BUN_MAX || BATcount(b) == BUN_MAX) { \
+ GDKerror("bunfastapp: too many elements to
accomodate (BUN_MAX)\n"); \
+ goto bunins_failed; \
+ } \
if (BATextend((b), BATgrows(b)) == NULL) \
goto bunins_failed; \
} \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
