From 66ff5e14f1b83cef74cd50e05ce11b364a2432e4 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 27 Jul 2015 01:32:10 -0400 Subject: [PATCH] Improved GCC test by adding "__GNUC__ >= 5" --- config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.h b/config.h index b49635f5..e2529256 100644 --- a/config.h +++ b/config.h @@ -508,7 +508,7 @@ NAMESPACE_END # endif #elif (__INTEL_COMPILER >= 1110) # define CRYPTOPP_CXX11_RVALUES 1 -#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) && !defined(__INTEL_COMPILER || __clang__) +#elif (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && !defined(__INTEL_COMPILER || __clang__) # define CRYPTOPP_CXX11_RVALUES 1 #endif // R-value compilers @@ -521,7 +521,7 @@ NAMESPACE_END # endif #elif (__INTEL_COMPILER >= 1400) # define CRYPTOPP_CXX11_RVALUES 1 -#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) && !defined(__INTEL_COMPILER || __clang__) +#elif (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__INTEL_COMPILER || __clang__) # define CRYPTOPP_CXX11_NOEXCEPT 1 # error #endif // noexcept compilers