arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tie CRYPTOPP_CXX17 to CRYPTOPP_CXX11

pull/595/head
Jeffrey Walton 2018-03-05 06:47:05 -05:00
parent f7f13c70c8
commit f1a3da834a
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config.h
View File

@ -54,9 +54,11 @@
# endif # endif
#endif #endif
// Define this to disable ASM, intrinsics and built-ins. The code will be // Define this to disable ASM, intrinsics and built-ins. The library will be
// compiled using C++ only. The library code will not include SSE2 (and // compiled using C++ only. The library code will not include SSE2 (and
// above), NEON, Aarch32, Aarch64, Power4, Power7 or Power8. // above), NEON, Aarch32, Aarch64, Power4, Power7 or Power8. Note the compiler
// may use higher ISAs depending on compiler options, but the library will not
// explictly use the ISAs.
// #define CRYPTOPP_DISABLE_ASM 1 // #define CRYPTOPP_DISABLE_ASM 1
// Define CRYPTOPP_NO_CXX11 to avoid C++11 related features shown at the // Define CRYPTOPP_NO_CXX11 to avoid C++11 related features shown at the
@ -69,6 +71,10 @@
// Also see https://github.com/weidai11/cryptopp/issues/529 // Also see https://github.com/weidai11/cryptopp/issues/529
// #define CRYPTOPP_NO_CXX11 1 // #define CRYPTOPP_NO_CXX11 1
// Define CRYPTOPP_NO_CXX17 to avoid C++17 related features shown at the end of
// this file. At the moment it should only affect std::uncaught_exceptions.
// #define CRYPTOPP_NO_CXX17 1
// Define this to allow unaligned data access. If you experience a break with // Define this to allow unaligned data access. If you experience a break with
// GCC at -O3, you should immediately suspect unaligned data accesses. // GCC at -O3, you should immediately suspect unaligned data accesses.
// #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS 1 // #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS 1
@ -1074,7 +1080,7 @@ NAMESPACE_END
// ***************** C++17 related ******************** // ***************** C++17 related ********************
// C++17 macro version, https://stackoverflow.com/q/38456127/608639 // C++17 macro version, https://stackoverflow.com/q/38456127/608639
#if !defined(CRYPTOPP_NO_CXX17) #if defined(CRYPTOPP_CXX11) && !defined(CRYPTOPP_NO_CXX17)
# if ((_MSC_VER >= 1900) || (__cplusplus >= 201703L)) && !defined(_STLPORT_VERSION) # if ((_MSC_VER >= 1900) || (__cplusplus >= 201703L)) && !defined(_STLPORT_VERSION)
# define CRYPTOPP_CXX17 1 # define CRYPTOPP_CXX17 1
# endif # endif