gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5511-g7e870b2e


From: Arnold Robbins
Subject: [SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5511-g7e870b2e
Date: Fri, 16 Aug 2024 07:51:17 -0400 (EDT)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-5.3-stable has been updated
       via  7e870b2ead2fa1f1fa25219e24375b6bc0e4fe7d (commit)
      from  28fa4da6c815acc45870d390d33c6e373c2d8668 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=7e870b2ead2fa1f1fa25219e24375b6bc0e4fe7d

commit 7e870b2ead2fa1f1fa25219e24375b6bc0e4fe7d
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Fri Aug 16 14:51:03 2024 +0300

    Updates in support.

diff --git a/support/ChangeLog b/support/ChangeLog
index 60f00963..9c2972d9 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2024-08-16         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * cdefs.h, verify.h: Sync from GNULIB.
+
 2024-04-26         Arnold D. Robbins     <arnold@skeeve.com>
 
        * cdefs.h, dfa.h, dynarray.h, flexmember.h, idx.h,
diff --git a/support/cdefs.h b/support/cdefs.h
index d38382ad..9c49eeb4 100644
--- a/support/cdefs.h
+++ b/support/cdefs.h
@@ -83,7 +83,7 @@
 #  define __NTH(fct)   __attribute__ ((__nothrow__ __LEAF)) fct
 #  define __NTHNL(fct)  __attribute__ ((__nothrow__)) fct
 # else
-#  if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major >= 4)
+#  if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major__ >= 4)
 #   if __cplusplus >= 201103L
 #    define __THROW    noexcept (true)
 #   else
diff --git a/support/verify.h b/support/verify.h
index 08268c24..978926a4 100644
--- a/support/verify.h
+++ b/support/verify.h
@@ -259,11 +259,22 @@ template <int w>
       && (!defined __cplusplus \
           || (__cpp_static_assert < 201411 \
               && __GNUG__ < 6 && __clang_major__ < 6 && _MSC_VER < 1910)))
-#  if defined __cplusplus && _MSC_VER >= 1900 && !defined __clang__
+#  if (defined __cplusplus && defined __GNUG__ && __GNUG__ < 6 \
+       && __cplusplus == 201103L && !defined __clang__)
+/* g++ >= 4.7, < 6 with option -std=c++11 or -std=gnu++11 supports the
+   two-arguments static_assert but not the one-argument static_assert, and
+   it does not support _Static_assert.
+   We have to play preprocessor tricks to distinguish the two cases.  */
+#   define _GL_SA1(a1) static_assert ((a1), "static assertion failed")
+#   define _GL_SA2 static_assert
+#   define _GL_SA3 static_assert
+#   define _GL_SA_PICK(x1,x2,x3,x4,...) x4
+#   define static_assert(...) _GL_SA_PICK(__VA_ARGS__,_GL_SA3,_GL_SA2,_GL_SA1) 
(__VA_ARGS__)
+#  elif defined __cplusplus && _MSC_VER >= 1900 && !defined __clang__
 /* MSVC 14 in C++ mode supports the two-arguments static_assert but not
    the one-argument static_assert, and it does not support _Static_assert.
    We have to play preprocessor tricks to distinguish the two cases.
-   Since the MSVC preprocessor is not ISO C compliant (see above),.
+   Since the MSVC preprocessor is not ISO C compliant (see above),
    the solution is specific to MSVC.  */
 #   define _GL_EXPAND(x) x
 #   define _GL_SA1(a1) static_assert ((a1), "static assertion failed")

-----------------------------------------------------------------------

Summary of changes:
 support/ChangeLog |  4 ++++
 support/cdefs.h   |  2 +-
 support/verify.h  | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]