From f0d79177194ff0b9cfcdc1863b56eb1ab1a4ae8b Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 11 Jul 2019 12:10:19 -0400 Subject: [PATCH] Move CRYPTOPP_NO_CXX11 and CRYPTOPP_NO_CXX17 to config_cxx.h It looks like these two were overlooked during refactoring --- config_asm.h | 14 -------------- config_cxx.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config_asm.h b/config_asm.h index 23b991d0..23fea931 100644 --- a/config_asm.h +++ b/config_asm.h @@ -38,20 +38,6 @@ // Also see https://bugs.llvm.org/show_bug.cgi?id=39895 . // #define CRYPTOPP_DISABLE_MIXED_ASM 1 -// Define CRYPTOPP_NO_CXX11 to avoid C++11 related features shown at the -// end of this file. Some compilers and standard C++ headers advertise C++11 -// but they are really just C++03 with some additional C++11 headers and -// non-conforming classes. You might also consider `-std=c++03` or -// `-std=gnu++03`, but they are required options when building the library -// and all programs. CRYPTOPP_NO_CXX11 is probably easier to manage but it may -// cause -Wterminate warnings under GCC. MSVC++ has a similar warning. -// Also see https://github.com/weidai11/cryptopp/issues/529 -// #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 - // CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is no longer honored. It // was removed at https://github.com/weidai11/cryptopp/issues/682 // #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS 1 diff --git a/config_cxx.h b/config_cxx.h index 541a1080..b5255ec1 100644 --- a/config_cxx.h +++ b/config_cxx.h @@ -42,6 +42,20 @@ # endif #endif +// Define CRYPTOPP_NO_CXX11 to avoid C++11 related features shown at the +// end of this file. Some compilers and standard C++ headers advertise C++11 +// but they are really just C++03 with some additional C++11 headers and +// non-conforming classes. You might also consider `-std=c++03` or +// `-std=gnu++03`, but they are required options when building the library +// and all programs. CRYPTOPP_NO_CXX11 is probably easier to manage but it may +// cause -Wterminate warnings under GCC. MSVC++ has a similar warning. +// Also see https://github.com/weidai11/cryptopp/issues/529 +// #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 + // Hack ahead. Apple's standard library does not have C++'s unique_ptr in C++11. // We can't test for unique_ptr directly because some of the non-Apple Clangs // on OS X fail the same way. However, modern standard libraries have