Changeset: 675575389faa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/675575389faa
Modified Files:
        gdk/gdk_string.c
Branch: default
Log Message:

Fix for 32 bit archs.


diffs (18 lines):

diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -228,13 +228,11 @@ ustrPut(BAT *b, var_t *dst, const char *
                        if (strcmp(v,
                                   ui.vh->base + ((var_t *) ui.base)[p]) == 0)
                                break;
-#if SIZEOF_VAR_T == 8
-       } else if (GDKupgradevarheap(ustrbat, (var_t) 1 << 33,
+       } else if (GDKupgradevarheap(ustrbat, (var_t) 1 << (4 * SIZEOF_VAR_T + 
1),
                                    ustrbat->batCapacity, 0) != GDK_SUCCEED) {
                MT_lock_unset(&ustrbat->theaplock);
                MT_rwlock_wrunlock(&ustrbat->thashlock);
                return (var_t) -1;
-#endif
        } else {
                if (h->size < GDK_STRHASHSIZE + BATTINY * GDK_VARALIGN) {
                        if (HEAPgrow(&b->tvheap, GDK_STRHASHSIZE + BATTINY * 
GDK_VARALIGN, true) != GDK_SUCCEED) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to