Commit bac16230 authored by Katharina Heck's avatar Katharina Heck
Browse files

Merge branch 'fix/clang-false-positive' into 'master'

[clang] suppress emission of deprecation warnings for using getPropValue

See merge request !1756
parents 5bff80bf 7d1aea9e
......@@ -112,8 +112,9 @@ template<class TypeTag, class MyTypeTag>
struct ElementBoundaryTypes { using type = UndefinedProperty; }; //!< Stores the boundary types on an element
#if defined(__clang__) && !defined(DONT_EMIT_CLANG_GRIDGEOMETRY_WARNING)
#warning "The property `FVGridGeometry` is deprecated in favor of `GridGeometry` \
and will be removed after release 3.1. \
#warning "The properties `FVGridGeometry` and `EnableFVGridGeometryCache` \
are deprecated in favor of `GridGeometry` and `EnableGridGeometryCache`. \
The old properties will be removed after release 3.1. \
If clang is used, no deprecation warnings are emitted. \
We recommend to use gcc for getting rid of the warnings. \
You can suppress this message by defining the preprocessor variable \
......
......@@ -147,13 +147,13 @@ using GetProp = typename Properties::Detail::GetPropImpl<TypeTag, Property>::typ
//! 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 Properties::Detail::GetPropImpl<TypeTag, Property>::type::type;
#ifdef __clang__
#pragma clang diagnostic pop
#endif
//! get the value data member of a property
template<class TypeTag, template<class,class> class Property>
constexpr auto getPropValue() { return Properties::Detail::GetPropImpl<TypeTag, Property>::type::value; }
#ifdef __clang__
#pragma clang diagnostic pop
#endif
} // end namespace Dumux
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment