fix static_assert macros

open62541 · Sep 19, 2017 · d49baff · d49baff
1 parent c9645d5
commit d49baff
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/include/ua_config.h.in b/include/ua_config.h.in
@@ -252,9 +252,10 @@ typedef uint8_t bool;
  * Example usage:
  * UA_STATIC_ASSERT(sizeof(long)==7, use_another_compiler_luke)
  * See: https://stackoverflow.com/a/4815532/869402 */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L /* C11 */
-# define UA_STATIC_ASSERT(cond,msg) \
-    _Static_assert(cond, msg)
+#if defined(__cplusplus) && __cplusplus >= 201103L /* C++11 or above */
+# define UA_STATIC_ASSERT(cond,msg) static_assert(cond, #msg)
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L /* C11 or above */
+# define UA_STATIC_ASSERT(cond,msg) _Static_assert(cond, #msg)
 #elif defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER) /* GCC, Clang, MSC */
 # define UA_CTASTR2(pre,post) pre ## post
 # define UA_CTASTR(pre,post) UA_CTASTR2(pre,post)