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

Use __cpp_lib_uncaught_exceptions for CRYPTOPP_CXX17_EXCEPTIONS 

Also see https://bugs.llvm.org/show_bug.cgi?id=39631
pull/739/head
Jeffrey Walton 2018-11-12 03:37:32 -05:00
parent 499a5e289d
commit a0f3744ed4
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -297,7 +297,7 @@ ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),)
else else
CXXFLAGS += -DCRYPTOPP_DISABLE_SSE2 CXXFLAGS += -DCRYPTOPP_DISABLE_SSE2
endif endif
# https://github.com/weidai11/cryptopp/issues/738 # https://github.com/weidai11/cryptopp/issues/738
UNUSED := $(shell rm -f a.out && rm -rf *.out.dSYM/) UNUSED := $(shell rm -f a.out && rm -rf *.out.dSYM/)

6
config.h
View File

@ -1175,9 +1175,11 @@ NAMESPACE_END
// Clang and __EXCEPTIONS see http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html // Clang and __EXCEPTIONS see http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html
#if defined(__clang__) #if defined(__clang__)
# if __EXCEPTIONS && __has_feature(cxx_exceptions) # if __EXCEPTIONS && __has_feature(cxx_exceptions)
# define CRYPTOPP_CXX17_EXCEPTIONS 1 # if __cpp_lib_uncaught_exceptions
# define CRYPTOPP_CXX17_EXCEPTIONS 1
# endif
# endif # endif
#elif (CRYPTOPP_MSC_VERSION >= 1900) || (__INTEL_COMPILER >= 1800) || (CRYPTOPP_GCC_VERSION >= 60000) #elif (CRYPTOPP_MSC_VERSION >= 1900) || (__INTEL_COMPILER >= 1800) || (CRYPTOPP_GCC_VERSION >= 60000) || (__cpp_lib_uncaught_exceptions)
# define CRYPTOPP_CXX17_EXCEPTIONS 1 # define CRYPTOPP_CXX17_EXCEPTIONS 1
#endif // uncaught_exceptions compilers #endif // uncaught_exceptions compilers