From ffa01562fdfcf57f38e300e4631665a919632814 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Thu, 29 Dec 2011 14:41:17 +0000 Subject: [PATCH] Don't define static_assert for C++. Even though _Static_assert() is pretty robust for C code, it cannot work correctly with C++ code. This is due to the fact that C++ template parameters may contain commas that are not enclosed in parentheses. For example: static_assert(foo::bar == baz, "..."); This causes _Static_assert to be called with an excessive number of parameters. If you want to use static_assert in C++, just use a C++11 compiler. Reported on: current@, ports@ --- include/assert.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/assert.h b/include/assert.h index 6633d8f96ff7..c880a782b963 100644 --- a/include/assert.h +++ b/include/assert.h @@ -58,7 +58,16 @@ #ifndef _ASSERT_H_ #define _ASSERT_H_ -#if __ISO_C_VISIBLE >= 2011 && (!defined(__cplusplus) || __cplusplus < 201103L) +/* + * Static assertions. In principle we could define static_assert for + * C++ older than C++11, but this breaks if _Static_assert is + * implemented as a macro. + * + * C++ template parameters may contain commas, even if not enclosed in + * parentheses, causing the _Static_assert macro to be invoked with more + * than two parameters. + */ +#if __ISO_C_VISIBLE >= 2011 && !defined(__cplusplus) #define static_assert _Static_assert #endif