From ea2e59c129b55f695e39312c006e457c793504b3 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 18 Oct 2018 13:55:23 +0200
Subject: [PATCH] [properties] move GetProp/GetPropType aliases to Dumux
namespace
---
dumux/common/properties/propertysystem.hh | 6 +++---
dumux/common/properties/propertysystemmacros.hh | 2 +-
test/porousmediumflow/1p/implicit/1ptestproblem.hh | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dumux/common/properties/propertysystem.hh b/dumux/common/properties/propertysystem.hh
index 54f70adc71..f3b82bb4b9 100644
--- a/dumux/common/properties/propertysystem.hh
+++ b/dumux/common/properties/propertysystem.hh
@@ -113,20 +113,20 @@ struct GetPropImpl
};
} // end namespace Detail
+} // end namespace Property
//! get the type of a property (equivalent to old macro GET_PROP(...))
template<class TypeTag, template<class,class> class Property>
-using GetProp = typename Detail::GetPropImpl<TypeTag, Property>::type;
+using GetProp = typename Properties::Detail::GetPropImpl<TypeTag, Property>::type;
//! get the type alias defined in the property (equivalent to old macro GET_PROP_TYPE(...))
template<class TypeTag, template<class,class> class Property>
-using GetPropType = typename Detail::GetPropImpl<TypeTag, Property>::type::type;
+using GetPropType = typename Properties::Detail::GetPropImpl<TypeTag, Property>::type::type;
//! get the value data member of a property (C++17 only, equivalent to old macro GET_PROP_VALUE(...))
// template<class TypeTag, template<class,class> class Property>
// constexpr auto getPropValue = Detail::GetPropImpl<TypeTag, Property>::type::value;
-} // end namespace Property
} // end namespace Dumux
#endif
diff --git a/dumux/common/properties/propertysystemmacros.hh b/dumux/common/properties/propertysystemmacros.hh
index 0972addd97..2cde0ca868 100644
--- a/dumux/common/properties/propertysystemmacros.hh
+++ b/dumux/common/properties/propertysystemmacros.hh
@@ -235,7 +235,7 @@ struct GetTypeTagInheritance<std::tuple<FirstTypeTag, OtherTypeTags...>>
template <class TypeTag> \
struct PropTagName<TypeTag, TTAG(EffTypeTagName)> \
{ \
- using Scalar = GetPropType<TypeTag, Scalar>; \
+ using Scalar = Dumux::GetPropType<TypeTag, Scalar>; \
public: \
using type = Scalar; \
static const Scalar value; \
diff --git a/test/porousmediumflow/1p/implicit/1ptestproblem.hh b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
index f45fa58898..6f685d03cb 100644
--- a/test/porousmediumflow/1p/implicit/1ptestproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
@@ -117,21 +117,21 @@ template <class TypeTag>
class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
- using GridView = Properties::GetPropType<TypeTag, Properties::GridView>;
+ using GridView = GetPropType<TypeTag, Properties::GridView>;
using Element = typename GridView::template Codim<0>::Entity;
- using Scalar = Properties::GetPropType<TypeTag, Properties::Scalar>;
+ using Scalar = GetPropType<TypeTag, Properties::Scalar>;
// copy some indices for convenience
- using Indices = typename Properties::GetPropType<TypeTag, Properties::ModelTraits>::Indices;
+ using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
enum {
// index of the primary variable
pressureIdx = Indices::pressureIdx
};
- using PrimaryVariables = Properties::GetPropType<TypeTag, Properties::PrimaryVariables>;
- using BoundaryTypes = Properties::GetPropType<TypeTag, Properties::BoundaryTypes>;
- using FVGridGeometry = Properties::GetPropType<TypeTag, Properties::FVGridGeometry>;
+ using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+ using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
static constexpr int dimWorld = GridView::dimensionworld;
--
GitLab