diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2019-10-20 21:46:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-20 21:46:05 -0400 |
| commit | d58a00ba21e7dc6d6dbaab3dc13159692de66096 (patch) | |
| tree | 3bb643ce6c119528a64f867b78996abe422cea32 /config_cxx.h | |
| parent | fea35d829ea2a7c9a1d874132d72a8cfc184d9b3 (diff) | |
| download | cryptopp-git-d58a00ba21e7dc6d6dbaab3dc13159692de66096.tar.gz | |
Cleanup config_*.h files, update travis.yml file (PR #898)
This started as an update to travis.yml to support ARM64 testing. Autotools had a failure under Clang, and it required a modification to config_asm.h. We eventually guarded the availability defines in CRYPTOPP_DISABLE_ASM.
Diffstat (limited to 'config_cxx.h')
| -rw-r--r-- | config_cxx.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config_cxx.h b/config_cxx.h index 17b2fd0c..7bcb3e53 100644 --- a/config_cxx.h +++ b/config_cxx.h @@ -25,6 +25,12 @@ #include "config_cpu.h"
#include "config_ver.h"
+// You may need to force include a C++ header on Android when using STLPort
+// to ensure _STLPORT_VERSION is defined
+#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || (defined(_STLPORT_VERSION) && ((_STLPORT_VERSION < 0x450) || defined(_STLP_NO_UNCAUGHT_EXCEPT_SUPPORT)))
+#define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
+#endif
+
// Ancient Crypto++ define, dating back to C++98 and C++03.
#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
# define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE 1
|