[前][次][番号順一覧][スレッド一覧]

ruby-changes:59522

From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Fri, 27 Dec 2019 12:03:47 +0900 (JST)
Subject: [ruby-changes:59522] 68c0dc8d36 (master): internal/static_assert.h rework

https://git.ruby-lang.org/ruby.git/commit/?id=68c0dc8d36

From 68c0dc8d363675881d60b9fde15645d9ee14fafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
 <shyouhei@r...>
Date: Mon, 2 Dec 2019 17:06:40 +0900
Subject: internal/static_assert.h rework

ISO/IEC 9899:2011 section 7.2 states that <assert.h> must define
static_assert.  Use it when available.

diff --git a/internal/static_assert.h b/internal/static_assert.h
index 05b79b4..6fe18d1 100644
--- a/internal/static_assert.h
+++ b/internal/static_assert.h
@@ -9,13 +9,20 @@ https://github.com/ruby/ruby/blob/trunk/internal/static_assert.h#L9
  *             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 */
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]