Fix some failing tests

diff --git a/tests/base/graph_coloring_01.cc b/tests/base/graph_coloring_01.cc
index b2dfd422182ebe884e8ef306df7aeac0158fd90d..ef9b504a1fdab0cb18cdb19790c6a5fb0dd1f3e6 100644 (file)
--- a/tests/base/graph_coloring_01.cc
+++ b/tests/base/graph_coloring_01.cc
@@ -38,7 +38,7 @@
 template <int dim>
 std::vector<types::global_dof_index>
 get_conflict_indices_cfem(
-  typename DoFHandler<dim>::active_cell_const iterator &it)
+  const typename DoFHandler<dim>::active_cell_iterator &it)
 {
   std::vector<types::global_dof_index> local_dof_indices(
     it->get_fe().dofs_per_cell);
@@ -67,7 +67,7 @@ check()
       cell,
       dof_handler.end(),
       std::function<std::vector<types::global_dof_index>(
-        typename DoFHandler<dim>::active_cell_const iterator &)>(
+        const typename DoFHandler<dim>::active_cell_iterator &)>(
         &get_conflict_indices_cfem<dim>)));
 
   // Output the coloring

diff --git a/tests/base/graph_coloring_02.cc b/tests/base/graph_coloring_02.cc
index 7febd009c3534017425a08f9e085d601ca023a01..27e573eb61b213683789c425b78838740fe021c9 100644 (file)
--- a/tests/base/graph_coloring_02.cc
+++ b/tests/base/graph_coloring_02.cc
@@ -38,7 +38,7 @@
 template <int dim>
 std::vector<types::global_dof_index>
 get_conflict_indices_cfem(
-  typename DoFHandler<dim>::active_cell_const iterator &it)
+  const typename DoFHandler<dim>::active_cell_iterator &it)
 {
   std::vector<types::global_dof_index> local_dof_indices(
     it->get_fe().dofs_per_cell);
@@ -76,7 +76,7 @@ check()
       dof_handler.begin_active(),
       dof_handler.end(),
       std::function<std::vector<types::global_dof_index>(
-        typename DoFHandler<dim>::active_cell_const iterator &)>(
+        const typename DoFHandler<dim>::active_cell_iterator &)>(
         &get_conflict_indices_cfem<dim>)));
 
   // Output the coloring

diff --git a/tests/base/graph_coloring_02a.cc b/tests/base/graph_coloring_02a.cc
index bc3bfb0e99a84568e1d820f4ffb8956937fc3c75..86628eea66695c5dbf4a1b670874cc49796e880b 100644 (file)
--- a/tests/base/graph_coloring_02a.cc
+++ b/tests/base/graph_coloring_02a.cc
@@ -38,7 +38,7 @@
 template <int dim>
 std::vector<types::global_dof_index>
 get_conflict_indices_cfem(
-  typename DoFHandler<dim>::active_cell_const iterator &it)
+  const typename DoFHandler<dim>::active_cell_iterator &it)
 {
   std::vector<types::global_dof_index> local_dof_indices(
     it->get_fe().dofs_per_cell);
@@ -78,7 +78,7 @@ check()
       dof_handler.begin_active(),
       dof_handler.end(),
       std::function<std::vector<types::global_dof_index>(
-        typename DoFHandler<dim>::active_cell_const iterator &)>(
+        const typename DoFHandler<dim>::active_cell_iterator &)>(
         &get_conflict_indices_cfem<dim>)));
 
   // verify that within each color, there is no conflict

diff --git a/tests/base/graph_coloring_03.cc b/tests/base/graph_coloring_03.cc
index 7543c9b3df9aede14d692433f5945f2ad4467ea4..592473464268793d210ac63bf4cc9e29acf92c7a 100644 (file)
--- a/tests/base/graph_coloring_03.cc
+++ b/tests/base/graph_coloring_03.cc
@@ -38,7 +38,7 @@
 template <int dim>
 std::vector<types::global_dof_index>
 get_conflict_indices_cfem(
-  typename DoFHandler<dim>::active_cell_const iterator &it)
+  const typename DoFHandler<dim>::active_cell_iterator &it)
 {
   std::vector<types::global_dof_index> local_dof_indices(
     it->get_fe().dofs_per_cell);
@@ -79,7 +79,7 @@ check()
       dof_handler.begin_active(),
       dof_handler.end(),
       std::function<std::vector<types::global_dof_index>(
-        typename DoFHandler<dim>::active_cell_const iterator &)>(
+        const typename DoFHandler<dim>::active_cell_iterator &)>(
         &get_conflict_indices_cfem<dim>)));
 
   // Output the coloring

diff --git a/tests/base/graph_coloring_05.cc b/tests/base/graph_coloring_05.cc
index c71be40045fba15873bd2c8353db67214778f378..2bde6fdbf9a837e048641856e3a967700d9814d8 100644 (file)
--- a/tests/base/graph_coloring_05.cc
+++ b/tests/base/graph_coloring_05.cc
@@ -39,7 +39,7 @@
 template <int dim>
 std::vector<types::global_dof_index>
 get_conflict_indices_cfem(
-  typename DoFHandler<dim>::active_cell_const iterator &it)
+  const typename DoFHandler<dim>::active_cell_iterator &it)
 {
   std::vector<types::global_dof_index> local_dof_indices(
     it->get_fe().dofs_per_cell);
@@ -77,7 +77,7 @@ check()
       dof_handler.begin_active(),
       dof_handler.end(),
       std::function<std::vector<types::global_dof_index>(
-        typename DoFHandler<dim>::active_cell_const iterator &)>(
+        const typename DoFHandler<dim>::active_cell_iterator &)>(
         &get_conflict_indices_cfem<dim>)));
 
   // Check that a color does not contain a conflict index twice

diff --git a/tests/base/graph_coloring_06.cc b/tests/base/graph_coloring_06.cc
index 02357f59e56c3582f63a7ef0d217afa329a02c1f..a7efbf72a202faa2154a5fcf6dddd5193721798c 100644 (file)
--- a/tests/base/graph_coloring_06.cc
+++ b/tests/base/graph_coloring_06.cc
@@ -38,7 +38,7 @@
 template <int dim>
 std::vector<types::global_dof_index>
 get_conflict_indices_cfem(
-  typename DoFHandler<dim>::active_cell_const iterator &it)
+  const typename DoFHandler<dim>::active_cell_iterator &it)
 {
   std::vector<types::global_dof_index> local_dof_indices(
     it->get_fe().dofs_per_cell);
@@ -82,7 +82,7 @@ check()
       dof_handler.begin_active(),
       dof_handler.end(),
       std::function<std::vector<types::global_dof_index>(
-        typename DoFHandler<dim>::active_cell_const iterator &)>(
+        const typename DoFHandler<dim>::active_cell_iterator &)>(
         &get_conflict_indices_cfem<dim>));
 
   for (unsigned int color = 0; color < coloring.size(); ++color)

diff --git a/tests/numerics/assemble_matrix_parallel_01.cc b/tests/numerics/assemble_matrix_parallel_01.cc
index 1e385bc37d7a6fdc327a30047fbf1b2a8566f087..c740f489a840e4f8f068d4ff4cea7942f30890f9 100644 (file)
--- a/tests/numerics/assemble_matrix_parallel_01.cc
+++ b/tests/numerics/assemble_matrix_parallel_01.cc
@@ -128,7 +128,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    typename DoFHandler<dim>::active_cell_const iterator &cell) const;
+    const typename DoFHandler<dim>::active_cell_iterator &cell) const;
 
   Triangulation<dim> triangulation;
 
@@ -238,7 +238,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  typename DoFHandler<dim>::active_cell_const iterator &cell) const
+  const typename DoFHandler<dim>::active_cell_iterator &cell) const
 {
   std::vector<types::global_dof_index> local_dof_indices(
     cell->get_fe().dofs_per_cell);
@@ -278,7 +278,7 @@ LaplaceProblem<dim>::setup_system()
     dof_handler.begin_active(),
     dof_handler.end(),
     static_cast<std::function<std::vector<types::global_dof_index>(
-      typename DoFHandler<dim>::active_cell_const iterator &)>>(
+      const typename DoFHandler<dim>::active_cell_iterator &)>>(
       std::bind(&LaplaceProblem<dim>::get_conflict_indices,
                 this,
                 std::placeholders::_1)));

diff --git a/tests/numerics/assemble_matrix_parallel_02.cc b/tests/numerics/assemble_matrix_parallel_02.cc
index 86e9c3c5476ef5f14211d3580c2647a08bab38f3..5da0c4e975327d4a1d942e1b5d1e1b48d54be256 100644 (file)
--- a/tests/numerics/assemble_matrix_parallel_02.cc
+++ b/tests/numerics/assemble_matrix_parallel_02.cc
@@ -143,7 +143,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    typename DoFHandler<dim>::active_cell_const iterator &cell) const;
+    const typename DoFHandler<dim>::active_cell_iterator &cell) const;
 
   Triangulation<dim> triangulation;
 
@@ -255,7 +255,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  typename DoFHandler<dim>::active_cell_const iterator &cell) const
+  const typename DoFHandler<dim>::active_cell_iterator &cell) const
 {
   std::vector<types::global_dof_index> local_dof_indices(
     cell->get_fe().dofs_per_cell);
@@ -296,7 +296,7 @@ LaplaceProblem<dim>::setup_system()
     dof_handler.begin_active(),
     dof_handler.end(),
     static_cast<std::function<std::vector<types::global_dof_index>(
-      typename DoFHandler<dim>::active_cell_const iterator &)>>(
+      const typename DoFHandler<dim>::active_cell_iterator &)>>(
       std::bind(&LaplaceProblem<dim>::get_conflict_indices,
                 this,
                 std::placeholders::_1)));

diff --git a/tests/numerics/assemble_matrix_parallel_03.cc b/tests/numerics/assemble_matrix_parallel_03.cc
index 452f0ef839d7b2172487822164d7150bcf8b784f..8f86b695d7529c63139501416efe4dfbe0806db5 100644 (file)
--- a/tests/numerics/assemble_matrix_parallel_03.cc
+++ b/tests/numerics/assemble_matrix_parallel_03.cc
@@ -128,7 +128,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    typename DoFHandler<dim>::active_cell_const iterator &cell) const;
+    const typename DoFHandler<dim>::active_cell_iterator &cell) const;
 
   Triangulation<dim> triangulation;
 
@@ -238,7 +238,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  typename DoFHandler<dim>::active_cell_const iterator &cell) const
+  const typename DoFHandler<dim>::active_cell_iterator &cell) const
 {
   std::vector<types::global_dof_index> local_dof_indices(
     cell->get_fe().dofs_per_cell);
@@ -278,7 +278,7 @@ LaplaceProblem<dim>::setup_system()
     dof_handler.begin_active(),
     dof_handler.end(),
     static_cast<std::function<std::vector<types::global_dof_index>(
-      typename DoFHandler<dim>::active_cell_const iterator &)>>(
+      const typename DoFHandler<dim>::active_cell_iterator &)>>(
       std::bind(&LaplaceProblem<dim>::get_conflict_indices,
                 this,
                 std::placeholders::_1)));

diff --git a/tests/numerics/assemble_matrix_parallel_04.cc b/tests/numerics/assemble_matrix_parallel_04.cc
index 81c93ce19b2dd15c078dbe27c193f3012bc2139b..ff059985694a881838fb933a0d8cf6ce7d1eb5bf 100644 (file)
--- a/tests/numerics/assemble_matrix_parallel_04.cc
+++ b/tests/numerics/assemble_matrix_parallel_04.cc
@@ -142,7 +142,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    typename DoFHandler<dim>::active_cell_const iterator &cell) const;
+    const typename DoFHandler<dim>::active_cell_iterator &cell) const;
 
   Triangulation<dim> triangulation;
 
@@ -254,7 +254,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  typename DoFHandler<dim>::active_cell_const iterator &cell) const
+  const typename DoFHandler<dim>::active_cell_iterator &cell) const
 {
   std::vector<types::global_dof_index> local_dof_indices(
     cell->get_fe().dofs_per_cell);
@@ -308,7 +308,7 @@ LaplaceProblem<dim>::setup_system()
     dof_handler.begin_active(),
     dof_handler.end(),
     static_cast<std::function<std::vector<types::global_dof_index>(
-      typename DoFHandler<dim>::active_cell_const iterator &)>>(
+      const typename DoFHandler<dim>::active_cell_iterator &)>>(
       std::bind(&LaplaceProblem<dim>::get_conflict_indices,
                 this,
                 std::placeholders::_1)));

diff --git a/tests/petsc/assemble_matrix_parallel_01.cc b/tests/petsc/assemble_matrix_parallel_01.cc
index a028c9a85ed12b366678c52364778320da7d18a6..e82023c8be59aa76175620d2035a540d06bb2796 100644 (file)
--- a/tests/petsc/assemble_matrix_parallel_01.cc
+++ b/tests/petsc/assemble_matrix_parallel_01.cc
@@ -127,7 +127,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    typename DoFHandler<dim>::active_cell_const iterator &cell) const;
+    const typename DoFHandler<dim>::active_cell_iterator &cell) const;
 
   Triangulation<dim> triangulation;
 
@@ -235,7 +235,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  typename DoFHandler<dim>::active_cell_const iterator &cell) const
+  const typename DoFHandler<dim>::active_cell_iterator &cell) const
 {
   std::vector<types::global_dof_index> local_dof_indices(
     cell->get_fe().dofs_per_cell);
@@ -271,7 +271,7 @@ LaplaceProblem<dim>::setup_system()
     dof_handler.begin_active(),
     dof_handler.end(),
     static_cast<std::function<std::vector<types::global_dof_index>(
-      typename DoFHandler<dim>::active_cell_const iterator &)>>(
+      const typename DoFHandler<dim>::active_cell_iterator &)>>(
       std::bind(&LaplaceProblem<dim>::get_conflict_indices,
                 this,
                 std::placeholders::_1)));

diff --git a/tests/trilinos/assemble_matrix_parallel_01.cc b/tests/trilinos/assemble_matrix_parallel_01.cc
index 71441e63704440783a057685a0dfa78216a2f403..8817e245a43c61daf0d083e996c73713a2eb1675 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_01.cc
+++ b/tests/trilinos/assemble_matrix_parallel_01.cc
@@ -124,7 +124,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    typename DoFHandler<dim>::active_cell_const iterator &cell) const;
+    const typename DoFHandler<dim>::active_cell_iterator &cell) const;
 
   Triangulation<dim> triangulation;
 
@@ -232,7 +232,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  typename DoFHandler<dim>::active_cell_const iterator &cell) const
+  const typename DoFHandler<dim>::active_cell_iterator &cell) const
 {
   std::vector<types::global_dof_index> local_dof_indices(
     cell->get_fe().dofs_per_cell);
@@ -271,7 +271,7 @@ LaplaceProblem<dim>::setup_system()
     dof_handler.begin_active(),
     dof_handler.end(),
     static_cast<std::function<std::vector<types::global_dof_index>(
-      typename DoFHandler<dim>::active_cell_const iterator &)>>(
+      const typename DoFHandler<dim>::active_cell_iterator &)>>(
       std::bind(&LaplaceProblem<dim>::get_conflict_indices,
                 this,
                 std::placeholders::_1)));