Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDimitrij Mijoski2021-03-26 02:04:45 +0100
committerMartin Hořeňovský2021-05-26 00:34:23 +0200
commit86f86c4c232b1698bb69fe70a086b3005a2c1de4 (patch)
treefe684cde91fa711add01dfd5d61ed58aae68ccbd
parent023b5306b444ebe3c20a008cdd150cf5510ff36d (diff)
downloadcatch3-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.
-rw-r--r--.travis.yml7
-rw-r--r--src/catch2/internal/catch_compiler_capabilities.hpp2
-rw-r--r--src/catch2/matchers/catch_matchers_templated.hpp6
-rw-r--r--tests/SelfTest/UsageTests/Generators.tests.cpp20
4 files changed, 20 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml
index ba0b0091..cd9e7c01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,6 +61,13 @@ matrix:
packages: ['clang-5.0']
env: COMPILER='clang++-5.0' CPP14=1
+ - os: linux
+ compiler: clang
+ addons:
+ apt:
+ sources: *all_sources
+ packages: ['clang-5.0']
+ env: COMPILER='clang++-5.0' CPP17=1
- os: linux
compiler: clang
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<
diff --git a/tests/SelfTest/UsageTests/Generators.tests.cpp b/tests/SelfTest/UsageTests/Generators.tests.cpp
index acfef8a9..b2154a1a 100644
--- a/tests/SelfTest/UsageTests/Generators.tests.cpp
+++ b/tests/SelfTest/UsageTests/Generators.tests.cpp
@@ -62,12 +62,12 @@ TEST_CASE("tables", "[generators]") {
// Structured bindings make the table utility much nicer to use
TEST_CASE( "strlen2", "[approvals][generators]" ) {
- auto [test_input, expected] = GENERATE( table<std::string, size_t>({
- {"one", 3},
- {"two", 3},
- {"three", 5},
- {"four", 4}
- }));
+ using tuple_type = std::tuple<std::string, int>; // see above workaround
+ auto [test_input, expected] =
+ GENERATE( table<std::string, size_t>( { tuple_type{ "one", 3 },
+ tuple_type{ "two", 3 },
+ tuple_type{ "three", 5 },
+ tuple_type{ "four", 4 } } ) );
REQUIRE( test_input.size() == expected );
}
@@ -103,11 +103,9 @@ TEST_CASE( "strlen3", "[generators]" ) {
static auto eatCucumbers( int start, int eat ) -> int { return start-eat; }
SCENARIO("Eating cucumbers", "[generators][approvals]") {
-
- auto [start, eat, left] = GENERATE( table<int,int,int> ({
- { 12, 5, 7 },
- { 20, 5, 15 }
- }));
+ using tuple_type = std::tuple<int, int, int>;
+ auto [start, eat, left] = GENERATE( table<int, int, int>(
+ { tuple_type{ 12, 5, 7 }, tuple_type{ 20, 5, 15 } } ) );
GIVEN( "there are " << start << " cucumbers" )
WHEN( "I eat " << eat << " cucumbers" )