Changeset: 9a4e8c65977d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a4e8c65977d
Modified Files:
gdk/gdk_bat.c
gdk/gdk_storage.c
Branch: pyapi
Log Message:
Make clang compile
diffs (30 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -852,10 +852,10 @@ BATcopy(BAT *b, int ht, int tt, int writ
bthp.farmid = BBPselectfarm(role, b->ttype, offheap);
hhp.farmid = BBPselectfarm(role, b->htype, varheap);
thp.farmid = BBPselectfarm(role, b->ttype, varheap);
- if ((b->htype && heapcopy(bn, "head", &bhhp,
&b->H->heap) < 0) ||
- (b->ttype && heapcopy(bn, "tail", &bthp,
&b->T->heap) < 0) ||
- (bn->H->vheap && heapcopy(bn, "hheap", &hhp,
b->H->vheap) < 0) ||
- (bn->T->vheap && heapcopy(bn, "theap", &thp,
b->T->vheap) < 0)) {
+ if ((b->htype && heapcopy(bn, "head", &bhhp,
&b->H->heap) != GDK_SUCCEED) ||
+ (b->ttype && heapcopy(bn, "tail", &bthp,
&b->T->heap) != GDK_SUCCEED) ||
+ (bn->H->vheap && heapcopy(bn, "hheap", &hhp,
b->H->vheap) != GDK_SUCCEED) ||
+ (bn->T->vheap && heapcopy(bn, "theap", &thp,
b->T->vheap) != GDK_SUCCEED)) {
HEAPfree(&thp, 1);
HEAPfree(&hhp, 1);
HEAPfree(&bthp, 1);
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -785,7 +785,7 @@ BATload_intern(bat i, int lock)
/* LOAD tail heap */
if (ATOMvarsized(b->ttype)) {
- if (HEAPload(b->T->vheap, nme, "theap", b->batRestricted ==
BAT_READ) < 0) {
+ if (HEAPload(b->T->vheap, nme, "theap", b->batRestricted ==
BAT_READ) != GDK_SUCCEED) {
if (b->H->vheap)
HEAPfree(b->H->vheap, 0);
HEAPfree(&b->H->heap, 0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
