diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-06-06 22:08:04 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-06-06 22:08:04 -0400 |
| commit | e961c2da5b002c6e8601d88546e54c544794fdfd (patch) | |
| tree | 9ff1611086a4a6133fa88345f108343f69cfa7c9 /config.h | |
| parent | 370483c7aaebc3097542738f41c86963ef2d6398 (diff) | |
| download | cryptopp-git-e961c2da5b002c6e8601d88546e54c544794fdfd.tar.gz | |
Merge Atomics branch into Master
Diffstat (limited to 'config.h')
| -rw-r--r-- | config.h | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -759,6 +759,18 @@ NAMESPACE_END # define CRYPTOPP_CXX11_ATOMICS 1
#endif // atomics
+// synchronization: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.3; Xcode 5.0; and Intel 12.0.
+// TODO: verify Clang and Intel versions; find __has_feature(x) extension for Clang
+#if (CRYPTOPP_MSC_VERSION >= 1700)
+# define CRYPTOPP_CXX11_SYNCHRONIZATION 1
+#elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1200)
+# define CRYPTOPP_CXX11_SYNCHRONIZATION 1
+#elif (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50000)
+# define CRYPTOPP_CXX11_SYNCHRONIZATION 1
+#elif (CRYPTOPP_GCC_VERSION >= 40400)
+# define CRYPTOPP_CXX11_SYNCHRONIZATION 1
+#endif // synchronization
+
// alignof/alignas: MS at VS2015 (19.00); GCC at 4.8; Clang at 3.3; and Intel 15.0.
#if (CRYPTOPP_MSC_VERSION >= 1900)
# define CRYPTOPP_CXX11_ALIGNAS 1
@@ -767,8 +779,10 @@ NAMESPACE_END # define CRYPTOPP_CXX11_ALIGNAS 1
# define CRYPTOPP_CXX11_ALIGNOF 1
#elif defined(__clang__)
-# if __has_feature(cxx_alignof)
+# if __has_feature(cxx_alignas)
# define CRYPTOPP_CXX11_ALIGNAS 1
+# endif
+# if __has_feature(cxx_alignof)
# define CRYPTOPP_CXX11_ALIGNOF 1
# endif
#elif (CRYPTOPP_GCC_VERSION >= 40800)
|