Remove redundant preprocessor checks.

diff --git a/source/base/function_parser.cc b/source/base/function_parser.cc
index 30736b08a8a24cb7e30bd90b7a62b95d401de16d..13c0812bb00405c8c686f08d73692ffd0dbb5eb8 100644 (file)
--- a/source/base/function_parser.cc
+++ b/source/base/function_parser.cc
@@ -70,7 +70,6 @@ FunctionParser<dim>::FunctionParser(const std::string &expression,
 }
 
 
-#ifdef DEAL_II_WITH_MUPARSER
 
 template <int dim>
 void
@@ -138,50 +137,6 @@ FunctionParser<dim>::value(const Point<dim> & p,
   return this->do_value(p, this->get_time(), component);
 }
 
-#else
-
-
-template <int dim>
-void
-FunctionParser<dim>::initialize(const std::string &,
-                                const std::vector<std::string> &,
-                                const std::map<std::string, double> &,
-                                const bool)
-{
-  AssertThrow(false, ExcNeedsFunctionparser());
-}
-
-template <int dim>
-void
-FunctionParser<dim>::initialize(const std::string &,
-                                const std::string &,
-                                const std::map<std::string, double> &,
-                                const bool)
-{
-  AssertThrow(false, ExcNeedsFunctionparser());
-}
-
-
-
-template <int dim>
-double
-FunctionParser<dim>::value(const Point<dim> &, unsigned int) const
-{
-  AssertThrow(false, ExcNeedsFunctionparser());
-  return 0.;
-}
-
-
-template <int dim>
-void
-FunctionParser<dim>::vector_value(const Point<dim> &, Vector<double> &) 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 3d039cdbbed405b59cf702b37e5fa18a98eb2bd3..1584d369ff0225cb0ff18ebe03faba4d58f993ac 100644 (file)
--- a/source/base/tensor_function_parser.cc
+++ b/source/base/tensor_function_parser.cc
@@ -70,7 +70,6 @@ TensorFunctionParser<rank, dim, Number>::TensorFunctionParser(
 }
 
 
-#ifdef DEAL_II_WITH_MUPARSER
 
 template <int rank, int dim, typename Number>
 void
@@ -173,55 +172,6 @@ TensorFunctionParser<rank, dim, Number>::value_list(
     }
 }
 
-#else
-
-
-template <int rank, int dim, typename Number>
-void
-TensorFunctionParser<rank, dim, Number>::initialize(
-  const std::string &,
-  const std::vector<std::string> &,
-  const std::map<std::string, double> &,
-  const bool)
-{
-  AssertThrow(false, ExcNeedsFunctionparser());
-}
-
-template <int rank, int dim, typename Number>
-void
-TensorFunctionParser<rank, dim, Number>::initialize(
-  const std::string &,
-  const std::string &,
-  const std::map<std::string, double> &,
-  const bool)
-{
-  AssertThrow(false, ExcNeedsFunctionparser());
-}
-
-
-
-template <int rank, int dim, typename Number>
-Tensor<rank, dim, Number>
-TensorFunctionParser<rank, dim, Number>::value(const Point<dim> &) const
-{
-  AssertThrow(false, ExcNeedsFunctionparser());
-  return Tensor<rank, dim, Number>();
-}
-
-
-
-template <int rank, int dim, typename Number>
-void
-TensorFunctionParser<rank, dim, Number>::value_list(
-  const std::vector<Point<dim>> &,
-  std::vector<Tensor<rank, dim, Number>> &) const
-{
-  AssertThrow(false, ExcNeedsFunctionparser());
-}
-
-
-#endif
-
 // explicit instantiations
 #include "tensor_function_parser.inst"