Changeset: 83f3873bfaec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83f3873bfaec
Modified Files:
gdk/gdk.h
gdk/gdk_heap.c
Branch: Jun2020
Log Message:
small fixes for fedora 32 compiler
diffs (27 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -916,9 +916,9 @@ gdk_export BUN ORDERfndlast(BAT *b, cons
gdk_export BUN BUNfnd(BAT *b, const void *right);
#define BUNfndVOID(b, v) \
- ((is_oid_nil(*(const oid*)(v)) ^ is_oid_nil((b)->tseqbase)) | \
+ (((is_oid_nil(*(const oid*)(v)) ^ is_oid_nil((b)->tseqbase)) | \
(*(const oid*)(v) < (b)->tseqbase) | \
- (*(const oid*)(v) >= (b)->tseqbase + (b)->batCount) ? \
+ (*(const oid*)(v) >= (b)->tseqbase + (b)->batCount)) ? \
BUN_NONE : \
(BUN) (*(const oid*)(v) - (b)->tseqbase))
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -741,7 +741,7 @@ HEAPdelete(Heap *h, const char *o, const
}
assert(strlen(ext) + strlen(".new") < sizeof(ext2));
strconcat_len(ext2, sizeof(ext2), ext, ".new", NULL);
- return (GDKunlink(h->farmid, BATDIR, o, ext) == GDK_SUCCEED) |
(GDKunlink(h->farmid, BATDIR, o, ext2) == GDK_SUCCEED) ? GDK_SUCCEED : GDK_FAIL;
+ return ((GDKunlink(h->farmid, BATDIR, o, ext) == GDK_SUCCEED) |
(GDKunlink(h->farmid, BATDIR, o, ext2) == GDK_SUCCEED)) ? GDK_SUCCEED :
GDK_FAIL;
}
int
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
