From f5881d121a5d3adbcb16d8ef3fcaa6b98e70159d Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 14 Jul 2019 19:02:58 -0400 Subject: [PATCH] CRYPTOPP_CXX11_STATIC_ASSERT -> CRYPTOPP_CXX14_STATIC_ASSERT WHoops, this is a C++14 feature --- config_cxx.h | 8 +++++--- misc.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config_cxx.h b/config_cxx.h index 7d6bd001..9aada65f 100644 --- a/config_cxx.h +++ b/config_cxx.h @@ -172,13 +172,15 @@ # define CRYPTOPP_CXX11_NULLPTR 1 #endif // nullptr_t compilers +#endif // CRYPTOPP_CXX11 + +// ***************** C++14 and above ******************** + // Extended static_assert with one argument #if (__cpp_static_assert >= 201411) -# define CRYPTOPP_CXX11_STATIC_ASSERT 1 +# define CRYPTOPP_CXX14_STATIC_ASSERT 1 #endif // static_assert -#endif // CRYPTOPP_CXX11 - // ***************** C++17 and above ******************** // C++17 is available diff --git a/misc.h b/misc.h index 23093be3..1e80bea4 100644 --- a/misc.h +++ b/misc.h @@ -147,7 +147,7 @@ class Integer; /// a CompileAssert structure is used. When the structure is used /// a negative-sized array triggers the assert at compile time. # define CRYPTOPP_COMPILE_ASSERT(expr) { ... } -#elif defined(CRYPTOPP_CXX11_STATIC_ASSERT) +#elif defined(CRYPTOPP_CXX14_STATIC_ASSERT) # define CRYPTOPP_COMPILE_ASSERT(expr) static_assert(expr) #else // CRYPTOPP_DOXYGEN_PROCESSING template