diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2020-08-07 01:12:27 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2020-08-07 01:12:27 -0400 |
| commit | 31036ca0568d8eceba07bd98a00f647baa30d582 (patch) | |
| tree | 6d6d1c3b9d175311e31e7a7cd153775961351829 /TestPrograms | |
| parent | 226eb9651fb9ea6d8bd6a06e3fad9122e12f2592 (diff) | |
| download | cryptopp-git-31036ca0568d8eceba07bd98a00f647baa30d582.tar.gz | |
Use __clang__ preprocessor macro in tests
Diffstat (limited to 'TestPrograms')
| -rw-r--r-- | TestPrograms/test_cxx11_noexcept.cxx | 6 | ||||
| -rw-r--r-- | TestPrograms/test_ppc_power7.cxx | 4 | ||||
| -rw-r--r-- | TestPrograms/test_ppc_power8.cxx | 4 | ||||
| -rw-r--r-- | TestPrograms/test_ppc_power9.cxx | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/TestPrograms/test_cxx11_noexcept.cxx b/TestPrograms/test_cxx11_noexcept.cxx index 68fbec43..3afcc0fd 100644 --- a/TestPrograms/test_cxx11_noexcept.cxx +++ b/TestPrograms/test_cxx11_noexcept.cxx @@ -2,15 +2,15 @@ # define GNUC_VERSION (__GNUC__*1000 + __GNUC_MINOR__*10)
#endif
-#if defined(__clang_major__) && defined(__apple_build_version__)
+#if defined(__clang__) && defined(__apple_build_version__)
# undef GNUC_VERSION
# define APPLE_VERSION (__clang_major__*1000 + __clang_minor__*10)
-#elif defined(__clang_major__)
+#elif defined(__clang__)
# undef GNUC_VERSION
# define LLVM_VERSION (__clang_major__*1000 + __clang_minor__*10)
#endif
-#if (GNUC_VERSION >= 4060) || (LLVM_VERSION >= 9000) || (APPLE_VERSION >= 10000)
+#if (GNUC_VERSION >= 7030)
# pragma GCC diagnostic ignored "-Wterminate"
#endif
diff --git a/TestPrograms/test_ppc_power7.cxx b/TestPrograms/test_ppc_power7.cxx index 3171a45e..24ecf4bd 100644 --- a/TestPrograms/test_ppc_power7.cxx +++ b/TestPrograms/test_ppc_power7.cxx @@ -2,10 +2,10 @@ # define GNUC_VERSION (__GNUC__*1000 + __GNUC_MINOR__*10)
#endif
-#if defined(__clang_major__) && defined(__apple_build_version__)
+#if defined(__clang__) && defined(__apple_build_version__)
# undef GNUC_VERSION
# define APPLE_VERSION (__clang_major__*1000 + __clang_minor__*10)
-#elif defined(__clang_major__)
+#elif defined(__clang__)
# undef GNUC_VERSION
# define LLVM_VERSION (__clang_major__*1000 + __clang_minor__*10)
#endif
diff --git a/TestPrograms/test_ppc_power8.cxx b/TestPrograms/test_ppc_power8.cxx index 90950dd4..7fec83bb 100644 --- a/TestPrograms/test_ppc_power8.cxx +++ b/TestPrograms/test_ppc_power8.cxx @@ -2,10 +2,10 @@ # define GNUC_VERSION (__GNUC__*1000 + __GNUC_MINOR__*10)
#endif
-#if defined(__clang_major__) && defined(__apple_build_version__)
+#if defined(__clang__) && defined(__apple_build_version__)
# undef GNUC_VERSION
# define APPLE_VERSION (__clang_major__*1000 + __clang_minor__*10)
-#elif defined(__clang_major__)
+#elif defined(__clang__)
# undef GNUC_VERSION
# define LLVM_VERSION (__clang_major__*1000 + __clang_minor__*10)
#endif
diff --git a/TestPrograms/test_ppc_power9.cxx b/TestPrograms/test_ppc_power9.cxx index 0b676fa6..3586073b 100644 --- a/TestPrograms/test_ppc_power9.cxx +++ b/TestPrograms/test_ppc_power9.cxx @@ -2,10 +2,10 @@ # define GNUC_VERSION (__GNUC__*1000 + __GNUC_MINOR__*10)
#endif
-#if defined(__clang_major__) && defined(__apple_build_version__)
+#if defined(__clang__) && defined(__apple_build_version__)
# undef GNUC_VERSION
# define APPLE_VERSION (__clang_major__*1000 + __clang_minor__*10)
-#elif defined(__clang_major__)
+#elif defined(__clang__)
# undef GNUC_VERSION
# define LLVM_VERSION (__clang_major__*1000 + __clang_minor__*10)
#endif
|