From c6abd44e4fa660e42282059954c3a03b5a28b8ff Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Fri, 15 Nov 2013 11:00:16 +0000
Subject: [PATCH] Remove C++ TR1 stuff which is not support by Apples Clang 5
compiler.
Since GCC 4.4 the used functions are available in the std namespace
anyway.
(reviewed by bernd)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11995 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/parameters.hh | 16 ++++++++--------
dumux/common/propertysystem.hh | 28 +++++++++++++---------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index 0e9c529c8f..3f1d1846c6 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -27,15 +27,15 @@
#ifndef DUMUX_PARAMETERS_HH
#define DUMUX_PARAMETERS_HH
-#include <dumux/common/propertysystem.hh>
-#include <dumux/common/exceptions.hh>
+#include <iostream>
+#include <list>
+#include <sstream>
+#include <unordered_map>
#include <dune/common/parametertree.hh>
-#include <iostream>
-#include <sstream>
-#include <list>
-#include <tr1/unordered_map>
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/exceptions.hh>
/*!
* \ingroup Parameter
@@ -294,7 +294,7 @@ private:
const char *groupName,
const char *paramName)
{
- typedef std::tr1::unordered_map<std::string, Blubb> StaticData;
+ typedef std::unordered_map<std::string, Blubb> StaticData;
static StaticData staticData;
typename StaticData::iterator it = staticData.find(paramName);
@@ -461,7 +461,7 @@ private:
canonicalName.append(paramName);
// cache parameters using a hash_map (Dune::Parameter tree is slow!)
- typedef std::tr1::unordered_map<std::string, ParamType> ParamCache;
+ typedef std::unordered_map<std::string, ParamType> ParamCache;
static ParamCache paramCache;
typename ParamCache::iterator it = paramCache.find(canonicalName);
if (it != paramCache.end())
diff --git a/dumux/common/propertysystem.hh b/dumux/common/propertysystem.hh
index 4a5d8f679c..52ca5180e6 100644
--- a/dumux/common/propertysystem.hh
+++ b/dumux/common/propertysystem.hh
@@ -39,21 +39,19 @@
#ifndef DUMUX_PROPERTIES_HH
#define DUMUX_PROPERTIES_HH
+#include <cstring>
+#include <iostream>
+#include <list>
+#include <map>
+#include <set>
+#include <sstream>
+#include <string>
// For is_base_of
-#include <tr1/type_traits>
+#include <type_traits>
// Integral Constant Expressions
-
#include <dune/common/classname.hh>
-#include <map>
-#include <set>
-#include <list>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <cstring>
-
namespace Dumux
{
namespace Properties
@@ -633,8 +631,8 @@ TypeTagRegistry::ChildrenListMap TypeTagRegistry::keys_;
#endif // !defined NO_PROPERTY_INTROSPECTION
-using std::tr1::is_void;
-using std::tr1::is_base_of;
+using std::is_void;
+using std::is_base_of;
// logical AND, OR and NOT operations to be used for template meta programming
template <bool b1, bool b2, bool b3 = true, bool b4 = true, bool b5 = true, bool b6 = true, bool b7 = true>
@@ -740,7 +738,7 @@ public:
template <class PropertyTag>
struct propertyExplicitlyUnsetOnTree<void, PropertyTag>
{
- const static bool value = std::tr1::true_type::value;
+ const static bool value = std::true_type::value;
};
//! \internal
@@ -781,7 +779,7 @@ template <class RealTypeTag, class PropertyTag>
class propertyDefinedOnTree<RealTypeTag, void, PropertyTag>
{
public:
- static const bool value = std::tr1::false_type::value;
+ static const bool value = std::false_type::value;
};
//! \internal
@@ -825,7 +823,7 @@ public:
template <class RealTypeTag, class PropertyTag>
struct defaultPropertyDefinedOnTree<RealTypeTag,void, PropertyTag>
{
- static const bool value = std::tr1::false_type::value;
+ static const bool value = std::false_type::value;
};
//! \internal
--
GitLab