Skip to content

Commit 2460769

Browse files
committed
Move Catch::always_false into decomposer.hpp
1 parent 28e651f commit 2460769

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/catch2/internal/catch_decomposer.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <catch2/catch_tostring.hpp>
1212
#include <catch2/internal/catch_stringref.hpp>
13-
#include <catch2/internal/catch_meta.hpp>
1413
#include <catch2/internal/catch_compare_traits.hpp>
1514
#include <catch2/internal/catch_test_failure_exception.hpp>
1615
#include <catch2/internal/catch_logical_traits.hpp>
@@ -37,6 +36,9 @@
3736

3837
namespace Catch {
3938

39+
template <typename T>
40+
struct always_false : std::false_type {};
41+
4042
class ITransientExpression {
4143
bool m_isBinaryExpression;
4244
bool m_result;

src/catch2/internal/catch_meta.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
#include <type_traits>
1212

1313
namespace Catch {
14-
template<typename T>
15-
struct always_false : std::false_type {};
14+
template <typename>
15+
struct true_given : std::true_type {};
1616

17-
template <typename> struct true_given : std::true_type {};
1817
struct is_callable_tester {
1918
template <typename Fun, typename... Args>
2019
static true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> test(int);

0 commit comments

Comments
 (0)