From 278d7fceff46ca8d441ed3013447fb57acbe1bc9 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 6 Mar 2021 19:53:35 +0000
Subject: [PATCH] [propertysytem] Remove outdated macro-related check
---
dumux/common/properties/propertysystem.hh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dumux/common/properties/propertysystem.hh b/dumux/common/properties/propertysystem.hh
index fe7ca724b8..3a802d363a 100644
--- a/dumux/common/properties/propertysystem.hh
+++ b/dumux/common/properties/propertysystem.hh
@@ -50,16 +50,15 @@ template<class P>
constexpr std::true_type isDefinedProperty(...) { return {}; }
//! check if a TypeTag inherits from other TypeTags
-//! the enable_if portion of decltype is only needed for the macro hack to work, if no macros are in use anymore it can be removed,
-//! i.e. then trailing return type is then -> decltype(std::declval<typename T::InheritsFrom>(), std::true_type{})
template<class T>
constexpr auto hasParentTypeTag(int)
--> decltype(std::declval<typename T::InheritsFrom>(), std::enable_if_t<!std::is_same<typename T::InheritsFrom, void>::value, int>{}, std::true_type{})
+-> decltype(std::declval<typename T::InheritsFrom>(), std::true_type{})
{ return {}; }
//! fall back if a TypeTag doesn't inherit
template<class T>
-constexpr std::false_type hasParentTypeTag(...) { return {}; }
+constexpr std::false_type hasParentTypeTag(...)
+{ return {}; }
//! helper alias to concatenate multiple tuples
template<class ...Tuples>
--
GitLab