Fixed regression with older compilers

diff --git a/tests/dofs/dof_tools_10.cc b/tests/dofs/dof_tools_10.cc
index b4c2381dfca4061b90859503612a62e8b0401fba..ebe5438be85ced6420b9ba4ec6d7bcfab3d36b99 100644 (file)
--- 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 2eca18e29b7b3271f4e09d6b14f8b75743cc464a..4d1bb1531fd6b2848423e0df65cba7666a0aa138 100644 (file)
--- 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 536b96ff0f2ec197f88f507f7b08699261092b00..2af6a0c2c421e77d7d61e46508fa6136a8edb9b7 100644 (file)
--- 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 23430841a3586c61a51b1421283788dbcb1eab6c..519b718887285c3051e6f3e4967aa49962cdb43b 100644 (file)
--- 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 ffa270301824ed805107344434a5a8fed2e90370..750e36087f71e06a479fed5ffd05892af057bf5b 100644 (file)
--- 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 104e2c32ac5e68e1bf2c26e06eb6cd6256cd62b9..525e8ed3dbe2728e85c8d060fbc370b7dc39cd92 100644 (file)
--- 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 664077c070a99312074d3b1136245c085cb38052..185239088b12e8094459fdc9ff51f0a9f634567c 100644 (file)
--- 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 449695efd18a9b5f60928a9575e53217380fe046..3051cbf74f620c186f78b6f6b3ca55c44b6aeeac 100644 (file)
--- 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 080692eefa2e918198d9cd1df32ae1d07cb07493..d11e9ff076138b5d0dbcd22f188bc3eb92400bd8 100644 (file)
--- 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>() << ' '