diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-04-09 02:12:11 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-04-09 02:12:11 +0200 |
| commit | ef127178789143d8a9817b81bc5c3c86fe744b50 (patch) | |
| tree | d9d163607a16fb02b2c91d85aa6e82468cc776bd /lib/verify.h | |
| parent | 306bd09ac7e6d8cb9983da12613f680c933d15dd (diff) | |
| download | gnulib-ef127178789143d8a9817b81bc5c3c86fe744b50.tar.gz | |
verify: Fix syntax error with GCC 4.6 in C++ mode.
* lib/verify.h (HAVE__STATIC_ASSERT): Don't define in C++ mode.
(HAVE_STATIC_ASSERT): New macro.
(verify_true, verify): Use 'static_assert' if it is supported and
'_Static_assert' is not supported.
Diffstat (limited to 'lib/verify.h')
| -rw-r--r-- | lib/verify.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/lib/verify.h b/lib/verify.h index 6c1f8c9e80..6bca43f6a9 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -22,14 +22,23 @@ /* Define HAVE__STATIC_ASSERT to 1 if _Static_assert works as per the C1X draft N1548 section 6.7.10. This is supported by GCC 4.6.0 and - later, and its use here generates easier-to-read diagnostics when - verify (R) fails. + later, in C mode, and its use here generates easier-to-read diagnostics + when verify (R) fails. + + Define HAVE_STATIC_ASSERT to 1 if static_assert works as per the + C1X draft N1548 section 7.2 or the C++0X draft N3242 section 7.(4). + This will likely be supported by future GCC versions, in C++ mode. For now, use this only with GCC. Eventually whether _Static_assert - works should be determined by 'configure'. */ -# if 4 < __GNUC__ || (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) + and static_assert works should be determined by 'configure'. */ +# if (4 < __GNUC__ || (__GNUC__ == 4 && 6 <= __GNUC_MINOR__)) && !defined __cplusplus # define HAVE__STATIC_ASSERT 1 # endif +/* The condition (99 < __GNUC__) is temporary, until we know about the + first G++ release that supports static_assert. */ +# if (99 < __GNUC__) && defined __cplusplus +# define HAVE_STATIC_ASSERT 1 +# endif /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike @@ -165,6 +174,13 @@ template <int w> _Static_assert (R, "verify_true (" #R ")"); \ int verify_dummy__; \ })) +# elif HAVE_STATIC_ASSERT +# define verify_true(R) \ + (!!sizeof \ + (struct { \ + static_assert (R, "verify_true (" #R ")"); \ + int verify_dummy__; \ + })) # else # define verify_true(R) \ (!!sizeof \ @@ -176,6 +192,8 @@ template <int w> # if HAVE__STATIC_ASSERT # define verify(R) _Static_assert (R, "verify (" #R ")") +# elif HAVE_STATIC_ASSERT +# define verify(R) static_assert (R, "verify (" #R ")") # else # define verify(R) \ extern int (* _GL_GENSYM (verify_function) (void)) [verify_true (R)] |