From ec8c794a26b52666a7a08d7823aa6338ea913cdd Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 30 May 2016 17:46:00 -0400 Subject: [PATCH] Removed duplicate C++11 atomics block. Fixed comment on CRYPTOPP_CXX11_ALIGNAS availability under MS toolchain --- config.h | 15 +-------------- config.recommend | 15 +-------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/config.h b/config.h index 3716c890..2c281e38 100644 --- a/config.h +++ b/config.h @@ -759,20 +759,7 @@ NAMESPACE_END # define CRYPTOPP_CXX11_ATOMICS 1 #endif // atomics -// atomics: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.1/3.2; and Intel 13.0. -#if (CRYPTOPP_MSC_VERSION >= 1700) -# define CRYPTOPP_CXX11_ATOMICS 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1300) -# define CRYPTOPP_CXX11_ATOMICS 1 -#elif defined(__clang__) -# if __has_feature(cxx_atomic) -# define CRYPTOPP_CXX11_ATOMICS 1 -# endif -#elif (CRYPTOPP_GCC_VERSION >= 40400) -# define CRYPTOPP_CXX11_ATOMICS 1 -#endif // atomics - -// alignof/alignas: MS at VS2013 (19.00); GCC at 4.8; Clang at 3.3; and Intel 15.0. +// alignof/alignas: MS at VS2015 (19.00); GCC at 4.8; Clang at 3.3; and Intel 15.0. #if (CRYPTOPP_MSC_VERSION >= 1900) # define CRYPTOPP_CXX11_ALIGNAS 1 # define CRYPTOPP_CXX11_ALIGNOF 1 diff --git a/config.recommend b/config.recommend index 44ff61df..d5f898ba 100644 --- a/config.recommend +++ b/config.recommend @@ -757,20 +757,7 @@ NAMESPACE_END # define CRYPTOPP_CXX11_ATOMICS 1 #endif // atomics -// atomics: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.1/3.2; and Intel 13.0. -#if (CRYPTOPP_MSC_VERSION >= 1700) -# define CRYPTOPP_CXX11_ATOMICS 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1300) -# define CRYPTOPP_CXX11_ATOMICS 1 -#elif defined(__clang__) -# if __has_feature(cxx_atomic) -# define CRYPTOPP_CXX11_ATOMICS 1 -# endif -#elif (CRYPTOPP_GCC_VERSION >= 40400) -# define CRYPTOPP_CXX11_ATOMICS 1 -#endif // atomics - -// alignof/alignas: MS at VS2013 (19.00); GCC at 4.8; Clang at 3.3; and Intel 15.0. +// alignof/alignas: MS at VS2015 (19.00); GCC at 4.8; Clang at 3.3; and Intel 15.0. #if (CRYPTOPP_MSC_VERSION >= 1900) # define CRYPTOPP_CXX11_ALIGNAS 1 # define CRYPTOPP_CXX11_ALIGNOF 1