From 24607694cba4320698d5d250dd72c197ce86d048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Fri, 9 Dec 2022 16:18:27 +0100 Subject: [PATCH] Move Catch::always_false into decomposer.hpp --- src/catch2/internal/catch_decomposer.hpp | 4 +++- src/catch2/internal/catch_meta.hpp | 5 ++--- 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 #include -#include #include #include #include @@ -37,6 +36,9 @@ namespace Catch { + template + 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 namespace Catch { - template - struct always_false : std::false_type {}; + template + struct true_given : std::true_type {}; - template struct true_given : std::true_type {}; struct is_callable_tester { template static true_given()(std::declval()...))> test(int);