From df4766060540a58e36011df75fc7b178b5ff2c68 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 19 Jul 2016 00:09:29 -0400 Subject: [PATCH] Remove unneeded 'defined(__INTEL_COMPILER)' --- config.h | 10 +++++----- config.recommend | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config.h b/config.h index 9a26fdd2..a5c0c09b 100644 --- a/config.h +++ b/config.h @@ -779,7 +779,7 @@ NAMESPACE_END // atomics: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.1/3.2; Intel 13.0; SunCC 12.5. #if (CRYPTOPP_MSC_VERSION >= 1700) # define CRYPTOPP_CXX11_ATOMICS 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1300) +#elif (__INTEL_COMPILER >= 1300) # define CRYPTOPP_CXX11_ATOMICS 1 #elif defined(__clang__) # if __has_feature(cxx_atomic) @@ -795,7 +795,7 @@ NAMESPACE_END // TODO: verify Clang and Intel versions; find __has_feature(x) extension for Clang #if (CRYPTOPP_MSC_VERSION >= 1700) # define CRYPTOPP_CXX11_SYNCHRONIZATION 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1200) +#elif (__INTEL_COMPILER >= 1200) # define CRYPTOPP_CXX11_SYNCHRONIZATION 1 #elif (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50000) # define CRYPTOPP_CXX11_SYNCHRONIZATION 1 @@ -809,7 +809,7 @@ NAMESPACE_END #if (CRYPTOPP_MSC_VERSION >= 1900) # define CRYPTOPP_CXX11_ALIGNAS 1 # define CRYPTOPP_CXX11_ALIGNOF 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1500) +#elif (__INTEL_COMPILER >= 1500) # define CRYPTOPP_CXX11_ALIGNAS 1 # define CRYPTOPP_CXX11_ALIGNOF 1 #elif defined(__clang__) @@ -830,7 +830,7 @@ NAMESPACE_END // noexcept: MS at VS2015 (19.00); GCC at 4.6; Clang at 3.0; Intel 14.0; SunCC 12.4. #if (CRYPTOPP_MSC_VERSION >= 1900) # define CRYPTOPP_CXX11_NOEXCEPT 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1400) +#elif (__INTEL_COMPILER >= 1400) # define CRYPTOPP_CXX11_NOEXCEPT 1 #elif defined(__clang__) # if __has_feature(cxx_noexcept) @@ -845,7 +845,7 @@ NAMESPACE_END // variadic templates: MS at VS2013 (18.00); GCC at 4.3; Clang at 2.9; Intel 12.1; SunCC 12.4. #if (CRYPTOPP_MSC_VERSION >= 1800) # define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1210) +#elif (__INTEL_COMPILER >= 1210) # define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1 #elif defined(__clang__) # if __has_feature(cxx_variadic_templates) diff --git a/config.recommend b/config.recommend index 934e461d..587ff044 100644 --- a/config.recommend +++ b/config.recommend @@ -779,7 +779,7 @@ NAMESPACE_END // atomics: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.1/3.2; Intel 13.0; SunCC 12.5. #if (CRYPTOPP_MSC_VERSION >= 1700) # define CRYPTOPP_CXX11_ATOMICS 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1300) +#elif (__INTEL_COMPILER >= 1300) # define CRYPTOPP_CXX11_ATOMICS 1 #elif defined(__clang__) # if __has_feature(cxx_atomic) @@ -795,7 +795,7 @@ NAMESPACE_END // TODO: verify Clang and Intel versions; find __has_feature(x) extension for Clang #if (CRYPTOPP_MSC_VERSION >= 1700) # define CRYPTOPP_CXX11_SYNCHRONIZATION 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1200) +#elif (__INTEL_COMPILER >= 1200) # define CRYPTOPP_CXX11_SYNCHRONIZATION 1 #elif (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50000) # define CRYPTOPP_CXX11_SYNCHRONIZATION 1 @@ -809,7 +809,7 @@ NAMESPACE_END #if (CRYPTOPP_MSC_VERSION >= 1900) # define CRYPTOPP_CXX11_ALIGNAS 1 # define CRYPTOPP_CXX11_ALIGNOF 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1500) +#elif (__INTEL_COMPILER >= 1500) # define CRYPTOPP_CXX11_ALIGNAS 1 # define CRYPTOPP_CXX11_ALIGNOF 1 #elif defined(__clang__) @@ -830,7 +830,7 @@ NAMESPACE_END // noexcept: MS at VS2015 (19.00); GCC at 4.6; Clang at 3.0; Intel 14.0; SunCC 12.4. #if (CRYPTOPP_MSC_VERSION >= 1900) # define CRYPTOPP_CXX11_NOEXCEPT 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1400) +#elif (__INTEL_COMPILER >= 1400) # define CRYPTOPP_CXX11_NOEXCEPT 1 #elif defined(__clang__) # if __has_feature(cxx_noexcept) @@ -845,7 +845,7 @@ NAMESPACE_END // variadic templates: MS at VS2013 (18.00); GCC at 4.3; Clang at 2.9; Intel 12.1; SunCC 12.4. #if (CRYPTOPP_MSC_VERSION >= 1800) # define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1 -#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1210) +#elif (__INTEL_COMPILER >= 1210) # define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1 #elif defined(__clang__) # if __has_feature(cxx_variadic_templates)