Changeset: 0495ad7a8f9c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0495ad7a8f9c Modified Files: monetdb_config.h.in Branch: Oct2020 Log Message:
static_assert is a keyword on C++11, so don't define the macro on that case. This fixes bug #7083 diffs (20 lines): diff --git a/monetdb_config.h.in b/monetdb_config.h.in --- a/monetdb_config.h.in +++ b/monetdb_config.h.in @@ -317,11 +317,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 _MSC_VER _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
