From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Tue, 25 Sep 2018 06:38:43 +0000 (+0200)
Subject: Make FunctionParser::expressions available without muparser support
X-Git-Tag: v9.1.0-rc1~691^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7227%2Fhead;p=dealii.git

Make FunctionParser::expressions available without muparser support
---

diff --git a/include/deal.II/base/function_parser.h b/include/deal.II/base/function_parser.h
index b1d4c1c574..fc03c246d2 100644
--- a/include/deal.II/base/function_parser.h
+++ b/include/deal.II/base/function_parser.h
@@ -402,12 +402,6 @@ private:
    */
   std::vector<std::string> var_names;
 
-  /**
-   * An array of function expressions (one per component), required to
-   * initialize fp in each thread.
-   */
-  std::vector<std::string> expressions;
-
   /**
    * Initialize fp and vars on the current thread. This function may only be
    * called once per thread. A thread can test whether the function has
@@ -418,6 +412,12 @@ private:
   init_muparser() const;
 #endif
 
+  /**
+   * An array of function expressions (one per component), required to
+   * initialize fp in each thread.
+   */
+  std::vector<std::string> expressions;
+
   /**
    * State of usability. This variable is checked every time the function is
    * called for evaluation. It's set to true in the initialize() methods.