From 1a74812f703081b66de594a004d2422b29c757fb Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 21 May 2022 15:05:18 -0400 Subject: [PATCH] Remove redundant preprocessor checks. --- source/base/function_parser.cc | 45 ------------------------ source/base/tensor_function_parser.cc | 50 --------------------------- 2 files changed, 95 deletions(-) diff --git a/source/base/function_parser.cc b/source/base/function_parser.cc index 30736b08a8..13c0812bb0 100644 --- a/source/base/function_parser.cc +++ b/source/base/function_parser.cc @@ -70,7 +70,6 @@ FunctionParser::FunctionParser(const std::string &expression, } -#ifdef DEAL_II_WITH_MUPARSER template void @@ -138,50 +137,6 @@ FunctionParser::value(const Point & p, return this->do_value(p, this->get_time(), component); } -#else - - -template -void -FunctionParser::initialize(const std::string &, - const std::vector &, - const std::map &, - const bool) -{ - AssertThrow(false, ExcNeedsFunctionparser()); -} - -template -void -FunctionParser::initialize(const std::string &, - const std::string &, - const std::map &, - const bool) -{ - AssertThrow(false, ExcNeedsFunctionparser()); -} - - - -template -double -FunctionParser::value(const Point &, unsigned int) const -{ - AssertThrow(false, ExcNeedsFunctionparser()); - return 0.; -} - - -template -void -FunctionParser::vector_value(const Point &, Vector &) const -{ - AssertThrow(false, ExcNeedsFunctionparser()); -} - - -#endif - // Explicit Instantiations. template class FunctionParser<1>; diff --git a/source/base/tensor_function_parser.cc b/source/base/tensor_function_parser.cc index 3d039cdbbe..1584d369ff 100644 --- a/source/base/tensor_function_parser.cc +++ b/source/base/tensor_function_parser.cc @@ -70,7 +70,6 @@ TensorFunctionParser::TensorFunctionParser( } -#ifdef DEAL_II_WITH_MUPARSER template void @@ -173,55 +172,6 @@ TensorFunctionParser::value_list( } } -#else - - -template -void -TensorFunctionParser::initialize( - const std::string &, - const std::vector &, - const std::map &, - const bool) -{ - AssertThrow(false, ExcNeedsFunctionparser()); -} - -template -void -TensorFunctionParser::initialize( - const std::string &, - const std::string &, - const std::map &, - const bool) -{ - AssertThrow(false, ExcNeedsFunctionparser()); -} - - - -template -Tensor -TensorFunctionParser::value(const Point &) const -{ - AssertThrow(false, ExcNeedsFunctionparser()); - return Tensor(); -} - - - -template -void -TensorFunctionParser::value_list( - const std::vector> &, - std::vector> &) const -{ - AssertThrow(false, ExcNeedsFunctionparser()); -} - - -#endif - // explicit instantiations #include "tensor_function_parser.inst" -- 2.39.5