From bcb67c06102ef16792d99c9b6ae0e8e5b5e48fe7 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 27 Apr 2017 15:57:42 +0200
Subject: [PATCH] [Cleanup] Use std::is_base_of and std::enable_if
---
src/enumparser.cc | 4 ++--
src/enumparser.hh | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/enumparser.cc b/src/enumparser.cc
index 93ebb91d..46c2e24b 100644
--- a/src/enumparser.cc
+++ b/src/enumparser.cc
@@ -9,8 +9,8 @@
#include "enumparser.hh"
template <class Enum>
-typename Dune::enable_if<
- !Dune::IsBaseOf<Dune::NotImplemented, StringToEnum<Enum>>::value,
+typename std::enable_if<
+ !std::is_base_of<Dune::NotImplemented, StringToEnum<Enum>>::value,
std::istream &>::type
operator>>(std::istream &lhs, Enum &e) {
std::string s;
diff --git a/src/enumparser.hh b/src/enumparser.hh
index 877c0d58..34f1c583 100644
--- a/src/enumparser.hh
+++ b/src/enumparser.hh
@@ -3,7 +3,7 @@
// Copyright Carsten Graeser 2012
-#include <dune/common/typetraits.hh>
+#include <type_traits>
#include <dune/solvers/solvers/solver.hh>
@@ -28,8 +28,8 @@ template <> struct StringToEnum<Config::PatchType> {
};
template <class Enum>
-typename Dune::enable_if<
- !Dune::IsBaseOf<Dune::NotImplemented, StringToEnum<Enum>>::value,
+typename std::enable_if<
+ !std::is_base_of<Dune::NotImplemented, StringToEnum<Enum>>::value,
std::istream &>::type
operator>>(std::istream &lhs, Enum &e);
#endif
--
GitLab