diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2023-04-22 23:14:35 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2023-04-22 23:14:35 +0300 |
| commit | e26e3eed5c17af799962e22d59b67aadec25387e (patch) | |
| tree | 15fc0454eb493cd6b2bee6ff633fbf43ef2e4c33 | |
| parent | a108bd4645545c7526f045af5db5ca47db86f3d0 (diff) | |
| parent | b9da24baaf9746732837e768787b453a1de28752 (diff) | |
| download | gawk-e26e3eed5c17af799962e22d59b67aadec25387e.tar.gz | |
Merge branch 'gawk-5.2-stable'
| -rw-r--r-- | support/ChangeLog | 4 | ||||
| -rw-r--r-- | support/verify.h | 16 |
2 files changed, 15 insertions, 5 deletions
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. |