Changeset: 0b90695c32a5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0b90695c32a5 Modified Files: gdk/gdk_imprints.c monetdb_config.h.in Branch: default Log Message:
Merged with Oct2020 diffs (32 lines): diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c --- a/gdk/gdk_imprints.c +++ b/gdk/gdk_imprints.c @@ -53,7 +53,7 @@ * one mask per "page" of the input BAT indicating in which bins the values * in that page fall. The size of the mask is given by imprints->bits. * The list of masks may be run-length compressed, see the dict area. A - * “page” is 64 bytes worth of values, so the number of values depends on + * "page" is 64 bytes worth of values, so the number of values depends on * the type of the value. * * The dict area starts immediately after the imps area. It consists of diff --git a/monetdb_config.h.in b/monetdb_config.h.in --- a/monetdb_config.h.in +++ b/monetdb_config.h.in @@ -324,11 +324,14 @@ typedef __uint128_t uhge; #define __attribute__(a) #endif +#if !defined(__cplusplus) || __cplusplus < 201103L #ifndef static_assert -/* static_assert is a C11 feature, defined in assert.h which also exists - * in many other compilers we ignore it if the compiler doesn't support it */ +/* static_assert is a C11/C++11 feature, defined in assert.h which also exists + * in many other compilers we ignore it if the compiler doesn't support it + * However in C11 static_assert is a macro, while on C++11 is a keyword */ #define static_assert(expr, mesg) ((void) 0) #endif +#endif #ifdef HAVE_STRINGS_H #include <strings.h> /* strcasecmp */ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list