OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove 'constexpr' from the property system

Browse Source 
it is not really needed and unneccessarily breaks the build on gcc-4.4
This commit is contained in:
Andreas Lauser 2013-09-23 13:45:41 +02:00
parent d086ee5c63
commit c971e7c590
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/core/utility/PropertySystem.hpp
View File

@ -346,7 +346,7 @@ namespace Properties {
/*value=*/__VA_ARGS__) \
{ \
typedef int type; \
static constexpr int value = __VA_ARGS__; \
static const int value = __VA_ARGS__; \
}
/*!
@ -362,7 +362,7 @@ namespace Properties {
/*value=*/__VA_ARGS__) \
{ \
typedef bool type; \
static constexpr bool value = __VA_ARGS__; \
static const bool value = __VA_ARGS__; \
}
/*!
@ -757,20 +757,20 @@ struct propertyExplicitlyUnset
template <class Tree, class PropertyTag>
class propertyExplicitlyUnsetOnTree
{
static constexpr bool explicitlyUnset = propertyExplicitlyUnset<Tree, PropertyTag>::value;
static const bool explicitlyUnset = propertyExplicitlyUnset<Tree, PropertyTag>::value;
template <class ChildTuple>
struct unsetOnAllChildren
{ static constexpr bool value = true; };
{ static const bool value = true; };
template <class Child, class ... RemainingChildren>
struct unsetOnAllChildren<std::tuple<Child, RemainingChildren...> >
{ static constexpr bool value =
{ static const bool value =
propertyExplicitlyUnsetOnTree<Child, PropertyTag>::value
&& unsetOnAllChildren<std::tuple<RemainingChildren...> >::value; };
public:
static constexpr bool value =
static const bool value =
(explicitlyUnset || (!Tree::isLeaf && unsetOnAllChildren<typename Tree::ChildrenTuple>::value));
};
@ -854,7 +854,7 @@ public:
typedef SelfT SelfType;
typedef typename RevertedTuple<Children...>::type ChildrenTuple;
static constexpr bool isLeaf = std::is_same<ChildrenTuple, std::tuple<> >::value;
static const bool isLeaf = std::is_same<ChildrenTuple, std::tuple<> >::value;
};
namespace PTag {