From 3564ad18bff3c5b581fd6eadd08a6b15ca593151 Mon Sep 17 00:00:00 2001 From: Treeston Date: Wed, 26 Aug 2020 23:38:31 +0200 Subject: cd30e0b follow-up (I could've sworn I pushed that to the PR branch. Sorry, Shauren.) --- src/common/Utilities/StringConvert.h | 1 + src/common/Utilities/Types.h | 6 ++++++ src/common/Utilities/Util.h | 9 --------- 3 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/common/Utilities/StringConvert.h b/src/common/Utilities/StringConvert.h index 7af791b91a1..f90e47cab10 100644 --- a/src/common/Utilities/StringConvert.h +++ b/src/common/Utilities/StringConvert.h @@ -21,6 +21,7 @@ #include "Define.h" #include "Errors.h" #include "Optional.h" +#include "Types.h" #include "Util.h" #include #include diff --git a/src/common/Utilities/Types.h b/src/common/Utilities/Types.h index ab78fb871a9..223a09c4ee3 100644 --- a/src/common/Utilities/Types.h +++ b/src/common/Utilities/Types.h @@ -63,6 +63,12 @@ namespace Trinity */ template typename Check, typename... Ts> using find_type_if_t = typename find_type_if::type; + + template + struct dependant_false { static constexpr bool value = false; }; + + template + constexpr bool dependant_false_v = dependant_false::value; } #endif // Types_h__ diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index c22584d970d..b3e37424a09 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -559,13 +559,4 @@ Ret* Coalesce(T1* first, T*... rest) return static_cast(first); } -namespace Trinity -{ - template - struct dependant_false { static constexpr bool value = false; }; - - template - constexpr bool dependant_false_v = dependant_false::value; -} - #endif -- cgit v1.2.3