diff options
| author | 卜部昌平 <shyouhei@ruby-lang.org> | 2019-12-02 17:06:40 +0900 |
|---|---|---|
| committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2019-12-26 20:45:12 +0900 |
| commit | 68c0dc8d363675881d60b9fde15645d9ee14fafc (patch) | |
| tree | 833df747ef3d72c1d30c2a001c213f0e5d6c04b8 | |
| parent | 6581db2187a1d5b6316fd1c942dccc6b6a3b9ca8 (diff) | |
internal/static_assert.h rework
ISO/IEC 9899:2011 section 7.2 states that <assert.h> must define
static_assert. Use it when available.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2711
| -rw-r--r-- | internal/static_assert.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/internal/static_assert.h b/internal/static_assert.h index 05b79b4ba3..6fe18d1261 100644 --- a/internal/static_assert.h +++ b/internal/static_assert.h @@ -9,13 +9,20 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ +#include <assert.h> /* for static_assert */ +#include "compilers.h" /* for __has_extension */ + +#if defined(static_assert) +/* Take assert.h definition */ +# define STATIC_ASSERT(name, expr) static_assert(expr, # name ": " # expr) + +#elif __has_extension(c_static_assert) || GCC_VERSION_SINCE(4, 6, 0) +# define STATIC_ASSERT(name, expr) \ + __extension__ _Static_assert(expr, # name ": " # expr) -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) -# define STATIC_ASSERT(name, expr) _Static_assert(expr, #name ": " #expr) -#elif GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert) -# define STATIC_ASSERT(name, expr) RB_GNUC_EXTENSION _Static_assert(expr, #name ": " #expr) #else -# define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)] -#endif +# define STATIC_ASSERT(name, expr) \ + typedef int static_assert_ ## name ## _check[1 - 2 * !(expr)] +#endif /* static_assert */ #endif /* INTERNAL_STATIC_ASSERT_H */ |