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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-12-09 16:18:27 +0100
committerMartin Hořeňovský2022-12-09 16:18:33 +0100
commit24607694cba4320698d5d250dd72c197ce86d048 (patch)
tree6cb78ef2ecb5e2c808a74ffcda6c8dbbc140c433 /src/catch2
parent28e651f1521449f2fce8b202307b6312a0ebe429 (diff)
downloadcatch3-24607694cba4320698d5d250dd72c197ce86d048.tar.gz
Move Catch::always_false into decomposer.hpp
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/internal/catch_decomposer.hpp4
-rw-r--r--src/catch2/internal/catch_meta.hpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/catch2/internal/catch_decomposer.hpp b/src/catch2/internal/catch_decomposer.hpp
index 792dd330..e0e46c1d 100644
--- a/src/catch2/internal/catch_decomposer.hpp
+++ b/src/catch2/internal/catch_decomposer.hpp
@@ -10,7 +10,6 @@
#include <catch2/catch_tostring.hpp>
#include <catch2/internal/catch_stringref.hpp>
-#include <catch2/internal/catch_meta.hpp>
#include <catch2/internal/catch_compare_traits.hpp>
#include <catch2/internal/catch_test_failure_exception.hpp>
#include <catch2/internal/catch_logical_traits.hpp>
@@ -37,6 +36,9 @@
namespace Catch {
+ template <typename T>
+ struct always_false : std::false_type {};
+
class ITransientExpression {
bool m_isBinaryExpression;
bool m_result;
diff --git a/src/catch2/internal/catch_meta.hpp b/src/catch2/internal/catch_meta.hpp
index 0ac1ca38..6fbc13a5 100644
--- a/src/catch2/internal/catch_meta.hpp
+++ b/src/catch2/internal/catch_meta.hpp
@@ -11,10 +11,9 @@
#include <type_traits>
namespace Catch {
- template<typename T>
- struct always_false : std::false_type {};
+ template <typename>
+ struct true_given : std::true_type {};
- template <typename> struct true_given : std::true_type {};
struct is_callable_tester {
template <typename Fun, typename... Args>
static true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> test(int);