diff options
| author | Dimitrij Mijoski | 2021-03-26 02:04:45 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2021-05-26 00:34:23 +0200 |
| commit | 86f86c4c232b1698bb69fe70a086b3005a2c1de4 (patch) | |
| tree | fe684cde91fa711add01dfd5d61ed58aae68ccbd /src | |
| parent | 023b5306b444ebe3c20a008cdd150cf5510ff36d (diff) | |
| download | catch3-86f86c4c232b1698bb69fe70a086b3005a2c1de4.tar.gz | |
Fix compiling with C++17 + Clang 5 + libstdc++ v5
This basically tests the combination where the compiler supports most
of C++17 but the library does not.
Diffstat (limited to 'src')
| -rw-r--r-- | src/catch2/internal/catch_compiler_capabilities.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/matchers/catch_matchers_templated.hpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/catch2/internal/catch_compiler_capabilities.hpp b/src/catch2/internal/catch_compiler_capabilities.hpp index a4369e87..956fd13f 100644 --- a/src/catch2/internal/catch_compiler_capabilities.hpp +++ b/src/catch2/internal/catch_compiler_capabilities.hpp @@ -222,7 +222,7 @@ // Check if byte is available and usable # if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER) # include <cstddef> - # if __cpp_lib_byte > 0 + # if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0) # define CATCH_INTERNAL_CONFIG_CPP17_BYTE # endif # endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER) diff --git a/src/catch2/matchers/catch_matchers_templated.hpp b/src/catch2/matchers/catch_matchers_templated.hpp index 544a2a5b..834d0b24 100644 --- a/src/catch2/matchers/catch_matchers_templated.hpp +++ b/src/catch2/matchers/catch_matchers_templated.hpp @@ -55,11 +55,11 @@ namespace Matchers { return arr; } - #ifdef CATCH_CPP17_OR_GREATER +#if defined( __cpp_lib_logical_traits ) && __cpp_lib_logical_traits >= 201510 using std::conjunction; - #else // CATCH_CPP17_OR_GREATER +#else // __cpp_lib_logical_traits template<typename... Cond> struct conjunction : std::true_type {}; @@ -67,7 +67,7 @@ namespace Matchers { template<typename Cond, typename... Rest> struct conjunction<Cond, Rest...> : std::integral_constant<bool, Cond::value && conjunction<Rest...>::value> {}; - #endif // CATCH_CPP17_OR_GREATER +#endif // __cpp_lib_logical_traits template<typename T> using is_generic_matcher = std::is_base_of< |