From: Mathias Anselmann <mathias.anselmann@posteo.de>
Date: Sun, 9 Jun 2019 07:57:34 +0000 (+0200)
Subject: Fixed regression with older compilers
X-Git-Tag: v9.2.0-rc1~1436^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e04d12b56ec08eaea75d148255e76ddb31e17c9a;p=dealii.git

Fixed regression with older compilers
---

diff --git a/tests/dofs/dof_tools_10.cc b/tests/dofs/dof_tools_10.cc
index b4c2381dfc..ebe5438be8 100644
--- a/tests/dofs/dof_tools_10.cc
+++ b/tests/dofs/dof_tools_10.cc
@@ -36,8 +36,8 @@ check_this(const DoFHandlerType &dof_handler)
   if (dof_handler.get_fe().get_unit_support_points().size() == 0)
     return;
 
-  std::vector<Point<dof_handler.dimension>> map(dof_handler.n_dofs());
-  MappingQ<dof_handler.dimension>           mapping(2);
+  std::vector<Point<DoFHandlerType::dimension>> map(dof_handler.n_dofs());
+  MappingQ<DoFHandlerType::dimension>           mapping(2);
 
   DoFTools::map_dofs_to_support_points(mapping, dof_handler, map);
 
diff --git a/tests/dofs/dof_tools_14.cc b/tests/dofs/dof_tools_14.cc
index 2eca18e29b..4d1bb1531f 100644
--- a/tests/dofs/dof_tools_14.cc
+++ b/tests/dofs/dof_tools_14.cc
@@ -33,7 +33,7 @@ check_this(const DoFHandlerType &dof_handler)
   deallog << dof_handler.n_boundary_dofs() << std::endl;
 
   // with std::map
-  std::map<types::boundary_id, const Function<dof_handler.dimension> *> fm;
+  std::map<types::boundary_id, const Function<DoFHandlerType::dimension> *> fm;
   fm[0] = nullptr;
   deallog << dof_handler.n_boundary_dofs(fm) << std::endl;
 
diff --git a/tests/dofs/dof_tools_16a.cc b/tests/dofs/dof_tools_16a.cc
index 536b96ff0f..2af6a0c2c4 100644
--- a/tests/dofs/dof_tools_16a.cc
+++ b/tests/dofs/dof_tools_16a.cc
@@ -45,7 +45,7 @@ check_this(const DoFHandlerType &dof_handler)
   DoFTools::map_dof_to_boundary_indices(dof_handler, set, map);
 
   // create sparsity pattern
-  std::map<types::boundary_id, const Function<dof_handler.dimension> *>
+  std::map<types::boundary_id, const Function<DoFHandlerType::dimension> *>
     boundary_ids;
   boundary_ids[0] = nullptr;
   SparsityPattern sp(dof_handler.n_boundary_dofs(boundary_ids),
diff --git a/tests/dofs/dof_tools_16b.cc b/tests/dofs/dof_tools_16b.cc
index 23430841a3..519b718887 100644
--- a/tests/dofs/dof_tools_16b.cc
+++ b/tests/dofs/dof_tools_16b.cc
@@ -45,7 +45,7 @@ check_this(const DoFHandlerType &dof_handler)
   DoFTools::map_dof_to_boundary_indices(dof_handler, set, map);
 
   // create sparsity pattern
-  std::map<types::boundary_id, const Function<dof_handler.dimension> *>
+  std::map<types::boundary_id, const Function<DoFHandlerType::dimension> *>
     boundary_ids;
   boundary_ids[0] = nullptr;
   DynamicSparsityPattern sp(dof_handler.n_boundary_dofs(boundary_ids));
diff --git a/tests/dofs/dof_tools_16c.cc b/tests/dofs/dof_tools_16c.cc
index ffa2703018..750e36087f 100644
--- a/tests/dofs/dof_tools_16c.cc
+++ b/tests/dofs/dof_tools_16c.cc
@@ -44,7 +44,7 @@ check_this(const DoFHandlerType &dof_handler)
   set.insert(0);
   DoFTools::map_dof_to_boundary_indices(dof_handler, set, map);
 
-  std::map<types::boundary_id, const Function<dof_handler.dimension> *>
+  std::map<types::boundary_id, const Function<DoFHandlerType::dimension> *>
     boundary_ids;
   boundary_ids[0] = nullptr;
   const unsigned int n_boundary_dofs =
diff --git a/tests/dofs/dof_tools_16d.cc b/tests/dofs/dof_tools_16d.cc
index 104e2c32ac..525e8ed3db 100644
--- a/tests/dofs/dof_tools_16d.cc
+++ b/tests/dofs/dof_tools_16d.cc
@@ -44,7 +44,7 @@ check_this(const DoFHandlerType &dof_handler)
   set.insert(0);
   DoFTools::map_dof_to_boundary_indices(dof_handler, set, map);
 
-  std::map<types::boundary_id, const Function<dof_handler.dimension> *>
+  std::map<types::boundary_id, const Function<DoFHandlerType::dimension> *>
     boundary_ids;
   boundary_ids[0] = nullptr;
   const types::global_dof_index n_boundary_dofs =
diff --git a/tests/dofs/dof_tools_19.cc b/tests/dofs/dof_tools_19.cc
index 664077c070..185239088b 100644
--- a/tests/dofs/dof_tools_19.cc
+++ b/tests/dofs/dof_tools_19.cc
@@ -58,7 +58,7 @@ check_this(const DoFHandlerType &dof_handler)
       std::string::npos)
     return;
 
-  Functions::ConstantFunction<dof_handler.dimension> test_func(
+  Functions::ConstantFunction<DoFHandlerType::dimension> test_func(
     1, dof_handler.get_fe().n_components());
 
   // don't run this test if hanging
@@ -74,8 +74,8 @@ check_this(const DoFHandlerType &dof_handler)
   deallog << cm.max_constraint_indirections() << std::endl;
 
   // L_2 project constant function onto field
-  QGauss<dof_handler.dimension> quadrature(6);
-  Vector<double>                solution(dof_handler.n_dofs());
+  QGauss<DoFHandlerType::dimension> quadrature(6);
+  Vector<double>                    solution(dof_handler.n_dofs());
 
   VectorTools::project(dof_handler, cm, quadrature, test_func, solution);
   cm.distribute(solution);
diff --git a/tests/dofs/dof_tools_21.cc b/tests/dofs/dof_tools_21.cc
index 449695efd1..3051cbf74f 100644
--- a/tests/dofs/dof_tools_21.cc
+++ b/tests/dofs/dof_tools_21.cc
@@ -48,7 +48,7 @@ template <typename DoFHandlerType>
 void
 check_this(const DoFHandlerType &dof_handler)
 {
-  Functions::CosineFunction<dof_handler.dimension> test_func(
+  Functions::CosineFunction<DoFHandlerType::dimension> test_func(
     dof_handler.get_fe().n_components());
 
   AffineConstraints<double> cm;
@@ -63,7 +63,7 @@ check_this(const DoFHandlerType &dof_handler)
   deallog << cm.n_constraints() << std::endl;
   deallog << cm.max_constraint_indirections() << std::endl;
 
-  QGauss<dof_handler.dimension> quadrature(6);
+  QGauss<DoFHandlerType::dimension> quadrature(6);
 
   Vector<double> unconstrained(dof_handler.n_dofs());
   Vector<double> constrained(dof_handler.n_dofs());
diff --git a/tests/dofs/n_dofs_per_object.cc b/tests/dofs/n_dofs_per_object.cc
index 080692eefa..d11e9ff076 100644
--- a/tests/dofs/n_dofs_per_object.cc
+++ b/tests/dofs/n_dofs_per_object.cc
@@ -29,7 +29,7 @@ template <typename DoFHandlerType>
 void
 check_this(const DoFHandlerType &dof_handler)
 {
-  const FiniteElement<dof_handler.dimension> &fe = dof_handler.get_fe();
+  const FiniteElement<DoFHandlerType::dimension> &fe = dof_handler.get_fe();
   deallog << fe.dofs_per_vertex << ' ' << fe.dofs_per_line << ' '
           << fe.dofs_per_quad << ' ' << fe.dofs_per_hex << std::endl;
   deallog << fe.template n_dofs_per_object<0>() << ' '