From c971e7c5900852045a3a4494892e4a8a5568f850 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Mon, 23 Sep 2013 13:45:41 +0200 Subject: [PATCH] remove 'constexpr' from the property system it is not really needed and unneccessarily breaks the build on gcc-4.4 --- opm/core/utility/PropertySystem.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/opm/core/utility/PropertySystem.hpp b/opm/core/utility/PropertySystem.hpp index 8da8ddab..dc624400 100644 --- a/opm/core/utility/PropertySystem.hpp +++ b/opm/core/utility/PropertySystem.hpp @@ -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 propertyExplicitlyUnsetOnTree { - static constexpr bool explicitlyUnset = propertyExplicitlyUnset::value; + static const bool explicitlyUnset = propertyExplicitlyUnset::value; template struct unsetOnAllChildren - { static constexpr bool value = true; }; + { static const bool value = true; }; template struct unsetOnAllChildren > - { static constexpr bool value = + { static const bool value = propertyExplicitlyUnsetOnTree::value && unsetOnAllChildren >::value; }; public: - static constexpr bool value = + static const bool value = (explicitlyUnset || (!Tree::isLeaf && unsetOnAllChildren::value)); }; @@ -854,7 +854,7 @@ public: typedef SelfT SelfType; typedef typename RevertedTuple::type ChildrenTuple; - static constexpr bool isLeaf = std::is_same >::value; + static const bool isLeaf = std::is_same >::value; }; namespace PTag {