From: Bruno Haible Date: Sat, 4 Feb 2023 13:31:08 +0000 (+0100) Subject: assert-h, verify: Fix conflict with standard C++ header files on macOS. X-Git-Tag: v1.0~1713 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=4e9fcc7b84fcac07a3e5a3cd5f66d1ff320dc8e8;p=gnulib.git assert-h, verify: Fix conflict with standard C++ header files on macOS. * lib/verify.h (_Static_assert): Don't redefine with clang ≥ 3.8.0 in C++ mode. * tests/test-assert-h-c++.cc: Also check against conflict with the standard C++ header files. * tests/test-assert-h-c++2.cc: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 6ef50965e9..0f8b53ff13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2023-02-04 Bruno Haible + + assert-h, verify: Fix conflict with standard C++ header files on macOS. + * lib/verify.h (_Static_assert): Don't redefine with clang ≥ 3.8.0 + in C++ mode. + * tests/test-assert-h-c++.cc: Also check against conflict with the + standard C++ header files. + * tests/test-assert-h-c++2.cc: Likewise. + 2023-02-04 Bruno Haible Activate all existing C++ tests. diff --git a/lib/verify.h b/lib/verify.h index b63cb26432..8f786af7f5 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -222,7 +222,21 @@ template /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ #ifdef _GL_STATIC_ASSERT_H -# if !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert +/* Define _Static_assert if needed. */ +/* With clang ≥ 3.8.0 in C++ mode, _Static_assert already works and accepts + 1 or 2 arguments. We better don't override it, because clang's standard + C++ library uses static_assert inside classes in several places, and our + replacement via _GL_VERIFY does not work in these contexts. */ +# if (defined __cplusplus && defined __clang__ \ + && (4 <= __clang_major__ + (8 <= __clang_minor__))) +# if 5 <= __clang_major__ +/* Avoid "warning: 'static_assert' with no message is a C++17 extension". */ +# pragma clang diagnostic ignored "-Wc++17-extensions" +# else +/* Avoid "warning: static_assert with no message is a C++1z extension". */ +# pragma clang diagnostic ignored "-Wc++1z-extensions" +# endif +# elif !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert # if !defined _MSC_VER || defined __clang__ # define _Static_assert(...) \ _GL_VERIFY (__VA_ARGS__, "static assertion failed", -) @@ -233,6 +247,7 @@ template _GL_VERIFY ((R), "static assertion failed", -) # endif # endif +/* Define static_assert if needed. */ # if (!defined static_assert \ && __STDC_VERSION__ < 202311 \ && (!defined __cplusplus \ diff --git a/tests/test-assert-h-c++.cc b/tests/test-assert-h-c++.cc index 4fa23bfeec..6b76565633 100644 --- a/tests/test-assert-h-c++.cc +++ b/tests/test-assert-h-c++.cc @@ -21,6 +21,10 @@ #include +/* Check against conflicts between and the C++ header files. */ +#include +#include + int main () diff --git a/tests/test-assert-h-c++2.cc b/tests/test-assert-h-c++2.cc index 3c19de325c..ffd7c8cf92 100644 --- a/tests/test-assert-h-c++2.cc +++ b/tests/test-assert-h-c++2.cc @@ -18,3 +18,7 @@ #include #include + +/* Check against conflicts between and other C++ header files. */ +#include +#include