From c29da767646552488bd5999536fb70c242d76825 Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Wed, 8 Apr 2015 13:22:34 +0200 Subject: [PATCH] [Extern] Adjust to upstream changes --- src/enumparser.cc | 15 --------------- src/enumparser.hh | 4 ---- 2 files changed, 19 deletions(-) diff --git a/src/enumparser.cc b/src/enumparser.cc index f5649eff..93ebb91d 100644 --- a/src/enumparser.cc +++ b/src/enumparser.cc @@ -67,22 +67,7 @@ Config::PatchType StringToEnum<Config::PatchType>::convert( DUNE_THROW(Dune::Exception, "failed to parse enum"); } -Solver::VerbosityMode StringToEnum<Solver::VerbosityMode>::convert( - std::string const &s) { - if (s == "full") - return Solver::FULL; - - if (s == "reduced") - return Solver::REDUCED; - - if (s == "quiet") - return Solver::QUIET; - - DUNE_THROW(Dune::Exception, "failed to parse enum"); -} - template std::istream &operator>>(std::istream &lhs, Config::FrictionModel &); template std::istream &operator>>(std::istream &lhs, Config::stateModel &); template std::istream &operator>>(std::istream &lhs, Config::scheme &); template std::istream &operator>>(std::istream &lhs, Config::PatchType &); -template std::istream &operator>>(std::istream &lhs, Solver::VerbosityMode &); diff --git a/src/enumparser.hh b/src/enumparser.hh index 0f5cd5d8..877c0d58 100644 --- a/src/enumparser.hh +++ b/src/enumparser.hh @@ -27,10 +27,6 @@ template <> struct StringToEnum<Config::PatchType> { static Config::PatchType convert(std::string const &s); }; -template <> struct StringToEnum<Solver::VerbosityMode> { - static Solver::VerbosityMode convert(std::string const &s); -}; - template <class Enum> typename Dune::enable_if< !Dune::IsBaseOf<Dune::NotImplemented, StringToEnum<Enum>>::value, -- GitLab