]> Savannah Git Hosting - gnulib.git/commitdiff
verify: treat GNU C++ 6 like recent C++
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2022 04:01:53 +0000 (23:01 -0500)
committerBruno Haible <bruno@clisp.org>
Wed, 14 Sep 2022 11:27:56 +0000 (13:27 +0200)
* lib/verify.h (_GL_VERIFY):
* m4/assert_h.m4 (gl_ASSERT_H):
If we check __cpp_static_assert < 200410, also check __GNUG__ < 6,
for consistency with the previous change.

ChangeLog
m4/assert_h.m4

index 81183fa6192a4ef493eec07b2dc21fdfc106b807..2e04ffd8d1e6f4d5b88c5bb94e3ac08d9a4d55be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       verify: treat GNU C++ 6 like recent C++
+       * m4/assert_h.m4 (gl_ASSERT_H):
+       If we check __cpp_static_assert < 201411, also check __GNUG__ < 6,
+       for consistency with the previous change.
+
 2022-09-13  Bruno Haible  <bruno@clisp.org>
 
        verify: Avoid syntax error due to static_assert with GNU C++ 6.x.
index 36b3c78c91f1f28c43d84f4c62fca86c07e724d9..ec756a970b7280783177bf63622138a0164e12cd 100644 (file)
@@ -47,7 +47,8 @@ AC_DEFUN([gl_ASSERT_H],
   dnl including assert.h.  Break the #undef apart with a comment
   dnl so that 'configure' does not comment it out.
   AH_VERBATIM([zzstatic_assert],
-[#if !defined HAVE_C_STATIC_ASSERT && __cpp_static_assert < 201411
+[#if (!defined HAVE_C_STATIC_ASSERT \
+     && __cpp_static_assert < 201411 && __GNUG__ < 6)
  #include <assert.h>
  #undef/**/assert
 #endif])