MonetDB: iso - Merged with Jul2021

[Pedro Ferreira]

Changeset: 96b6121d3782 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/96b6121d3782
Branch: iso
Log Message:

Merged with Jul2021


diffs (30 lines):

diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -168,6 +168,9 @@ gdk_return GDKunlink(int farmid, const c
        __attribute__((__visibility__("hidden")));
 void HASHappend(BAT *b, BUN i, const void *v)
        __attribute__((__visibility__("hidden")));
+#ifdef _MSC_VER
+inline
+#endif
 void HASHappend_locked(BAT *b, BUN i, const void *v)
        __attribute__((__visibility__("hidden")));
 void HASHfree(BAT *b)
@@ -176,10 +179,16 @@ bool HASHgonebad(BAT *b, const void *v)
        __attribute__((__visibility__("hidden")));
 void HASHdelete(BAT *b, BUN p, const void *v)
        __attribute__((__visibility__("hidden")));
+#ifdef _MSC_VER
+inline
+#endif
 void HASHdelete_locked(BAT *b, BUN p, const void *v)
        __attribute__((__visibility__("hidden")));
 void HASHinsert(BAT *b, BUN p, const void *v)
        __attribute__((__visibility__("hidden")));
+#ifdef _MSC_VER
+inline
+#endif
 void HASHinsert_locked(BAT *b, BUN p, const void *v)
        __attribute__((__visibility__("hidden")));
 BUN HASHmask(BUN cnt)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list