From 652665c1059c4676b30771c24172c4506a1a52f9 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 6 Jul 2016 15:45:18 -0500 Subject: [PATCH] Avoid C++11 initialization of member variables. --- tests/fe/mapping_q_manifold_02.cc | 42 ++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/tests/fe/mapping_q_manifold_02.cc b/tests/fe/mapping_q_manifold_02.cc index 52ca3acf7f..8473ef52e4 100644 --- a/tests/fe/mapping_q_manifold_02.cc +++ b/tests/fe/mapping_q_manifold_02.cc @@ -70,25 +70,34 @@ template class PushForward : public Function { public: - PushForward () : Function(dim, 0.) {} //,component(component) {} + PushForward () + : + Function(dim, 0.), + h (0.028), + x_max (4.5*h), + y_max (2.036*h), + z_max (4.5*h), + y_FoR (h) + {} virtual ~PushForward() {}; virtual double value (const Point &p,const unsigned int component = 0) const; private: - const double h = 0.028; + const double h; // data from initial block - const double x_max = 4.5*h;//9.0*h; - const double y_max = 2.036*h; - const double z_max = 4.5*h; + const double x_max; + const double y_max; + const double z_max; - const double y_FoR = h; + const double y_FoR; }; + template double PushForward::value(const Point &p,const unsigned int component) const { @@ -119,19 +128,28 @@ template class PullBack : public Function { public: - PullBack () : Function(dim, 0.) {} //,component(component) {} + PullBack () + : + Function(dim, 0.), + h (0.028), + x_max (4.5*h), + y_max (2.036*h), + z_max (4.5*h), + y_FoR (h) + {} virtual ~PullBack() {}; virtual double value (const Point &p,const unsigned int component = 0) const; private: - const double h = 0.028; - const double x_max = 4.5*h;//9.0*h; - const double y_max = 2.036*h; - const double z_max = 4.5*h; + const double h; + + const double x_max; + const double y_max; + const double z_max; - const double y_FoR = h; + const double y_FoR; }; template -- 2.39.5