gawk-diffs
[Top][All Lists]
Advanced

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

[SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-5048-gb9da24ba


From: Arnold Robbins
Subject: [SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-5048-gb9da24ba
Date: Sat, 22 Apr 2023 16:14:16 -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.2-stable has been updated
       via  b9da24baaf9746732837e768787b453a1de28752 (commit)
      from  58503d8bf67a6563cb163b9988e707533d6d257e (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=b9da24baaf9746732837e768787b453a1de28752

commit b9da24baaf9746732837e768787b453a1de28752
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sat Apr 22 23:14:01 2023 +0300

    Sync with gnulib.

diff --git a/support/ChangeLog b/support/ChangeLog
index c2c3c338..6bddae5d 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2023-04-22         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * verify.h: Update from GNULIB.
+
 2023-04-14         Arnold D. Robbins     <arnold@skeeve.com>
 
        * Makefile.am: Update copyright year.
diff --git a/support/verify.h b/support/verify.h
index c7002432..e4af9151 100644
--- a/support/verify.h
+++ b/support/verify.h
@@ -241,10 +241,16 @@ template <int w>
 #   define _Static_assert(...) \
       _GL_VERIFY (__VA_ARGS__, "static assertion failed", -)
 #  else
-    /* Work around MSVC preprocessor incompatibility with ISO C; see
-       <https://stackoverflow.com/questions/5134523/>.  */
-#   define _Static_assert(R, ...) \
-      _GL_VERIFY ((R), "static assertion failed", -)
+#   if defined __cplusplus && _MSC_VER >= 1910
+     /* In MSVC 14.1 or newer, static_assert accepts one or two arguments,
+        but _Static_assert is not defined.  */
+#    define _Static_assert static_assert
+#   else
+     /* Work around MSVC preprocessor incompatibility with ISO C; see
+        <https://stackoverflow.com/questions/5134523/>.  */
+#    define _Static_assert(R, ...) \
+       _GL_VERIFY ((R), "static assertion failed", -)
+#   endif
 #  endif
 # endif
 /* Define static_assert if needed.  */
@@ -252,7 +258,7 @@ template <int w>
       && __STDC_VERSION__ < 202311 \
       && (!defined __cplusplus \
           || (__cpp_static_assert < 201411 \
-              && __GNUG__ < 6 && __clang_major__ < 6)))
+              && __GNUG__ < 6 && __clang_major__ < 6 && _MSC_VER < 1910)))
 #  if 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.

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

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


hooks/post-receive
-- 
gawk



reply via email to

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