From 1493d76c9f27ce99cbe29e8da172d2d785ddb325 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 18 Sep 2022 21:17:11 +0200 Subject: [PATCH] verify: Avoid syntax error due to static_assert with MSVC 14 in C++. * lib/verify.h (static_assert): For MSVC in C++ mode, use a definition that supports both the two-arguments and the one-argument syntax. --- ChangeLog | 6 ++++++ lib/verify.h | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b9240f94c1..432b125c85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-09-14 Bruno Haible + + verify: Avoid syntax error due to static_assert with MSVC 14 in C++. + * lib/verify.h (static_assert): For MSVC in C++ mode, use a definition + that supports both the two-arguments and the one-argument syntax. + 2022-09-14 Bruno Haible posix_spawn-* tests: Fix test failure on mingw when libtool is in use. diff --git a/lib/verify.h b/lib/verify.h index dc99beed60..3d2cb91d65 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -224,7 +224,22 @@ template _GL_VERIFY ((R), "static assertion failed", -) # endif # if __cpp_static_assert < 201411 && __GNUG__ < 6 && !defined static_assert -# define static_assert _Static_assert /* C11 requires this #define. */ +# 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. + We have to play preprocessor tricks to distinguish the two cases. + Since the MSVC preprocessor is not ISO C compliant (cf. + ), the solution is specific + to MSVC. */ +# define _GL_EXPAND(x) x +# 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_EXPAND(_GL_SA_PICK(__VA_ARGS__,_GL_SA3,_GL_SA2,_GL_SA1)) (__VA_ARGS__) +# else +# define static_assert _Static_assert /* C11 requires this #define. */ +# endif # endif #endif -- 2.39.5