Standardize on 'const X' instead of 'X const', part II

diff --git a/contrib/python-bindings/source/wrappers.cc b/contrib/python-bindings/source/wrappers.cc
index 3dabef03cfa36bb1a73950f5f05b50cdfc0d8f1b..0846367979c114708e004a21f55b5da796077dad 100644 (file)
--- a/contrib/python-bindings/source/wrappers.cc
+++ b/contrib/python-bindings/source/wrappers.cc
@@ -41,7 +41,7 @@ namespace python
 
 DEAL_II_NAMESPACE_CLOSE
 
-char const *pydealii_docstring =
+const char *pydealii_docstring =
   "                                                             \n"
   "PyDealII                                                     \n"
   "========                                                     \n"

diff --git a/include/deal.II/base/numbers.h b/include/deal.II/base/numbers.h
index 360b7cda76f5d3a1137f7e508388789b87744ca7..099b4745cf77d85d2017e3cb584733b42c709c65 100644 (file)
--- a/include/deal.II/base/numbers.h
+++ b/include/deal.II/base/numbers.h
@@ -687,7 +687,7 @@ namespace internal
     }
 
   public:
-    static bool const value = test<From, To>(0);
+    static const bool value = test<From, To>(0);
   };
 
   /*

diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index 96daf28834c23f4741bf2513bf8bd914b473ad43..64fcb694b72f3b81f2b5e59e8e6fdaf8fbe9f67d 100644 (file)
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -1628,14 +1628,14 @@ namespace Patterns
     template <typename T>
     struct is_list_compatible
     {
-      static constexpr bool const value =
+      static constexpr const bool value =
         internal::is_list_compatible<std::decay_t<T>>::value;
     };
 
     template <typename T>
     struct is_map_compatible
     {
-      static constexpr bool const value =
+      static constexpr const bool value =
         internal::is_map_compatible<std::decay_t<T>>::value;
     };
 

diff --git a/include/deal.II/base/time_stepping.templates.h b/include/deal.II/base/time_stepping.templates.h
index 0b2af26ef28de65ffa5592add776c4c38cabfa61..27fb5e3719fb55f323e452e6012d6e3728215ecd 100644 (file)
--- a/include/deal.II/base/time_stepping.templates.h
+++ b/include/deal.II/base/time_stepping.templates.h
@@ -543,7 +543,7 @@ namespace TimeStepping
             this->n_stages = 2;
             this->b.reserve(this->n_stages);
             this->c.reserve(this->n_stages);
-            double const gamma = 1.0 - 1.0 / std::sqrt(2.0);
+            const double gamma = 1.0 - 1.0 / std::sqrt(2.0);
             this->b.push_back(1.0 - gamma);
             this->b.push_back(gamma);
             this->a.push_back(std::vector<double>(1, gamma));

diff --git a/include/deal.II/boost_adaptors/bounding_box.h b/include/deal.II/boost_adaptors/bounding_box.h
index f8dac97331ff4764375b0a6e623511e2f8d7d6b5..1968ef69f0b7f0eef40760753915b25900cf73f9 100644 (file)
--- a/include/deal.II/boost_adaptors/bounding_box.h
+++ b/include/deal.II/boost_adaptors/bounding_box.h
@@ -59,7 +59,7 @@ namespace boost
          * a dealii::BoundingBox.
          */
         static inline double
-        get(dealii::BoundingBox<dim, Number> const &box)
+        get(const dealii::BoundingBox<dim, Number> &box)
         {
           return box.get_boundary_points().first[D];
         }
@@ -87,7 +87,7 @@ namespace boost
          * a dealii::BoundingBox.
          */
         static inline double
-        get(dealii::BoundingBox<dim, Number> const &box)
+        get(const dealii::BoundingBox<dim, Number> &box)
         {
           return box.get_boundary_points().second[D];
         }

diff --git a/include/deal.II/boost_adaptors/point.h b/include/deal.II/boost_adaptors/point.h
index 6a1ad0f3a1e3d207d90e86f723af333689e4e944..4eee748f7d392ebdadd1b623ec9c1a1fc23c9de1 100644 (file)
--- a/include/deal.II/boost_adaptors/point.h
+++ b/include/deal.II/boost_adaptors/point.h
@@ -68,7 +68,7 @@ namespace boost
       struct access<dealii::Point<dim, Number>, D>
       {
         static inline double
-        get(dealii::Point<dim, Number> const &p)
+        get(const dealii::Point<dim, Number> &p)
         {
           return p[D];
         }

diff --git a/include/deal.II/numerics/matrix_creator.templates.h b/include/deal.II/numerics/matrix_creator.templates.h
index 46d7ee87d6d2a263432d983f1c21e63ad0134ebf..c994cbe859228ed1ea6f2854f76f592b73e7855e 100644 (file)
--- a/include/deal.II/numerics/matrix_creator.templates.h
+++ b/include/deal.II/numerics/matrix_creator.templates.h
@@ -986,14 +986,13 @@ namespace MatrixCreator
       const MatrixCreator::internal::AssemblerBoundary::Scratch &,
       MatrixCreator::internal::AssemblerBoundary::
         CopyData<dim, spacedim, number> & copy_data,
-      Mapping<dim, spacedim> const &      mapping,
-      FiniteElement<dim, spacedim> const &fe,
-      Quadrature<dim - 1> const &         q,
-      std::map<types::boundary_id, const Function<spacedim, number> *> const
+      const Mapping<dim, spacedim> &      mapping,
+      const FiniteElement<dim, spacedim> &fe,
+      const Quadrature<dim - 1> &         q,
+      const std::map<types::boundary_id, const Function<spacedim, number> *>
         &                                     boundary_functions,
-      Function<spacedim, number> const *const coefficient,
-      std::vector<unsigned int> const &       component_mapping)
-
+      const Function<spacedim, number> *const coefficient,
+      const std::vector<unsigned int> &       component_mapping)
     {
       // Most assertions for this function are in the calling function
       // before creating threads.
@@ -1218,11 +1217,11 @@ namespace MatrixCreator
     template <int dim, int spacedim, typename number>
     void
     copy_boundary_mass_matrix_1(
-      MatrixCreator::internal::AssemblerBoundary::
-        CopyData<dim, spacedim, number> const &copy_data,
-      std::map<types::boundary_id, const Function<spacedim, number> *> const
+      const MatrixCreator::internal::AssemblerBoundary::
+        CopyData<dim, spacedim, number> &copy_data,
+      const std::map<types::boundary_id, const Function<spacedim, number> *>
         &                                         boundary_functions,
-      std::vector<types::global_dof_index> const &dof_to_boundary_mapping,
+      const std::vector<types::global_dof_index> &dof_to_boundary_mapping,
       SparseMatrix<number> &                      matrix,
       Vector<number> &                            rhs_vector)
     {
@@ -1295,13 +1294,13 @@ namespace MatrixCreator
       const MatrixCreator::internal::AssemblerBoundary::Scratch &,
       MatrixCreator::internal::AssemblerBoundary::CopyData<1, 3, float>
         & /*copy_data*/,
-      Mapping<1, 3> const &,
-      FiniteElement<1, 3> const &,
-      Quadrature<0> const &,
-      std::map<types::boundary_id, const Function<3, float> *> const
+      const Mapping<1, 3> &,
+      const FiniteElement<1, 3> &,
+      const Quadrature<0> &,
+      const std::map<types::boundary_id, const Function<3, float> *>
         & /*boundary_functions*/,
-      Function<3, float> const *const /*coefficient*/,
-      std::vector<unsigned int> const & /*component_mapping*/)
+      const Function<3, float> *const /*coefficient*/,
+      const std::vector<unsigned int> & /*component_mapping*/)
     {
       Assert(false, ExcNotImplemented());
     }
@@ -1312,13 +1311,13 @@ namespace MatrixCreator
       const MatrixCreator::internal::AssemblerBoundary::Scratch &,
       MatrixCreator::internal::AssemblerBoundary::CopyData<1, 3, double>
         & /*copy_data*/,
-      Mapping<1, 3> const &,
-      FiniteElement<1, 3> const &,
-      Quadrature<0> const &,
-      std::map<types::boundary_id, const Function<3, double> *> const
+      const Mapping<1, 3> &,
+      const FiniteElement<1, 3> &,
+      const Quadrature<0> &,
+      const std::map<types::boundary_id, const Function<3, double> *>
         & /*boundary_functions*/,
-      Function<3, double> const *const /*coefficient*/,
-      std::vector<unsigned int> const & /*component_mapping*/)
+      const Function<3, double> *const /*coefficient*/,
+      const std::vector<unsigned int> & /*component_mapping*/)
     {
       Assert(false, ExcNotImplemented());
     }
@@ -1396,8 +1395,8 @@ namespace MatrixCreator
                                                 component_mapping);
       },
       [&boundary_functions, &dof_to_boundary_mapping, &matrix, &rhs_vector](
-        MatrixCreator::internal::AssemblerBoundary::
-          CopyData<dim, spacedim, number> const &copy_data) {
+        const MatrixCreator::internal::AssemblerBoundary::
+          CopyData<dim, spacedim, number> &copy_data) {
         internal::copy_boundary_mass_matrix_1(copy_data,
                                               boundary_functions,
                                               dof_to_boundary_mapping,
@@ -1419,13 +1418,13 @@ namespace MatrixCreator
       const MatrixCreator::internal::AssemblerBoundary::Scratch &,
       MatrixCreator::internal::AssemblerBoundary ::
         CopyData<dim, spacedim, number> &         copy_data,
-      hp::MappingCollection<dim, spacedim> const &mapping,
-      hp::FECollection<dim, spacedim> const &     fe_collection,
-      hp::QCollection<dim - 1> const &            q,
+      const hp::MappingCollection<dim, spacedim> &mapping,
+      const hp::FECollection<dim, spacedim> &     fe_collection,
+      const hp::QCollection<dim - 1> &            q,
       const std::map<types::boundary_id, const Function<spacedim, number> *>
         &                                     boundary_functions,
-      Function<spacedim, number> const *const coefficient,
-      std::vector<unsigned int> const &       component_mapping)
+      const Function<spacedim, number> *const coefficient,
+      const std::vector<unsigned int> &       component_mapping)
     {
       const unsigned int n_components = fe_collection.n_components();
       const unsigned int n_function_components =
@@ -1672,11 +1671,11 @@ namespace MatrixCreator
     template <int dim, int spacedim, typename number>
     void
     copy_hp_boundary_mass_matrix_1(
-      MatrixCreator::internal::AssemblerBoundary ::
-        CopyData<dim, spacedim, number> const &copy_data,
-      std::map<types::boundary_id, const Function<spacedim, number> *> const
+      const MatrixCreator::internal::AssemblerBoundary ::
+        CopyData<dim, spacedim, number> &copy_data,
+      const std::map<types::boundary_id, const Function<spacedim, number> *>
         &                                         boundary_functions,
-      std::vector<types::global_dof_index> const &dof_to_boundary_mapping,
+      const std::vector<types::global_dof_index> &dof_to_boundary_mapping,
       SparseMatrix<number> &                      matrix,
       Vector<number> &                            rhs_vector)
     {
@@ -1872,8 +1871,8 @@ namespace MatrixCreator
                                                    component_mapping);
       },
       [&boundary_functions, &dof_to_boundary_mapping, &matrix, &rhs_vector](
-        MatrixCreator::internal::AssemblerBoundary ::
-          CopyData<dim, spacedim, number> const &copy_data) {
+        const MatrixCreator::internal::AssemblerBoundary ::
+          CopyData<dim, spacedim, number> &copy_data) {
         internal::copy_hp_boundary_mass_matrix_1(copy_data,
                                                  boundary_functions,
                                                  dof_to_boundary_mapping,

diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc
index a3062a5910ba70ca96ff94e8c7b990c0bebc5906..9e5434400f2cab24821c9422a6254eba5ed902ee 100644 (file)
--- a/source/grid/grid_generator.cc
+++ b/source/grid/grid_generator.cc
@@ -2009,8 +2009,8 @@ namespace GridGenerator
                 ExcMessage("Invalid angle phi specified."));
 
     // the first 8 vertices are in the x-y-plane
-    Point<3> const p = Point<3>(R, 0.0, 0.0);
-    double const   a = 1. / (1 + std::sqrt(2.0));
+    const Point<3> p = Point<3>(R, 0.0, 0.0);
+    const double   a = 1. / (1 + std::sqrt(2.0));
     // A value of 1 indicates "open" torus with angle < 2*pi, which
     // means that we need an additional layer of vertices
     const unsigned int additional_layer =
@@ -2031,12 +2031,12 @@ namespace GridGenerator
 
     // create remaining vertices by rotating around negative y-axis (the
     // direction is to ensure positive cell measures)
-    double const phi_cell = phi / n_cells_toroidal;
+    const double phi_cell = phi / n_cells_toroidal;
     for (unsigned int c = 1; c < n_point_layers_toroidal; ++c)
       {
         for (unsigned int v = 0; v < 8; ++v)
           {
-            double const r_2d      = vertices[v][0];
+            const double r_2d      = vertices[v][0];
             vertices[8 * c + v][0] = r_2d * std::cos(phi_cell * c);
             vertices[8 * c + v][1] = vertices[v][1];
             vertices[8 * c + v][2] = r_2d * std::sin(phi_cell * c);

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 7b7ad67ad22c636ed872906f89cb459b774eccd4..856745b8b35fa194a17c9b253d511a05cf97d036 100644 (file)
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -394,9 +394,9 @@ namespace GridTools
 
                     J.compute_svd();
 
-                    double const max_sv = J.singular_value(0);
-                    double const min_sv = J.singular_value(dim - 1);
-                    double const ar     = max_sv / min_sv;
+                    const double max_sv = J.singular_value(0);
+                    const double min_sv = J.singular_value(dim - 1);
+                    const double ar     = max_sv / min_sv;
 
                     // Take the max between the previous and the current
                     // aspect ratio value; if we had previously encountered

diff --git a/source/lac/cuda_solver_direct.cc b/source/lac/cuda_solver_direct.cc
index dbad0a6d2711acd7ac19e19eadf9284141e2ce22..02fa4d1bfffc67087d95e2ee222c2f8ea2b78907 100644 (file)
--- a/source/lac/cuda_solver_direct.cc
+++ b/source/lac/cuda_solver_direct.cc
@@ -316,8 +316,8 @@ namespace CUDAWrappers
                      Number *                    x_dev)
     {
       // Change the format of the matrix from sparse to dense
-      unsigned int const m = matrix.m();
-      unsigned int const n = matrix.n();
+      const unsigned int m = matrix.m();
+      const unsigned int n = matrix.n();
       Assert(m == n, ExcMessage("The matrix is not square"));
       Number *dense_matrix_dev;
       Utilities::CUDA::malloc(dense_matrix_dev, m * n);

diff --git a/source/lac/cuda_sparse_matrix.cc b/source/lac/cuda_sparse_matrix.cc
index 95ebe1e79868c0443f61df9b3c601060ca65d868..1cce237c1e8168a29150c5af8ab613779ddf4575 100644 (file)
--- a/source/lac/cuda_sparse_matrix.cc
+++ b/source/lac/cuda_sparse_matrix.cc
@@ -392,7 +392,7 @@ namespace CUDAWrappers
     nnz                              = sparse_matrix_host.n_nonzero_elements();
     n_rows                           = sparse_matrix_host.m();
     n_cols                           = sparse_matrix_host.n();
-    unsigned int const  row_ptr_size = n_rows + 1;
+    const unsigned int  row_ptr_size = n_rows + 1;
     std::vector<Number> val;
     val.reserve(nnz);
     std::vector<int> column_index;
@@ -414,8 +414,8 @@ namespace CUDAWrappers
         row_ptr[row + 1] = row_ptr[row] + counter;
 
         // Sort the elements in the row
-        unsigned int const offset     = row_ptr[row];
-        int const          diag_index = column_index[offset];
+        const unsigned int offset     = row_ptr[row];
+        const int          diag_index = column_index[offset];
         Number             diag_elem  = sparse_matrix_host.diag_element(row);
         unsigned int       pos        = 1;
         while ((column_index[offset + pos] < row) && (pos < counter))

diff --git a/source/lac/vector.cc b/source/lac/vector.cc
index 342e723ce045e2d95bc9de86d8a363bfb8cb5742..54d97765c140bd2ec83249efd78d0ba80df729c9 100644 (file)
--- a/source/lac/vector.cc
+++ b/source/lac/vector.cc
@@ -31,7 +31,7 @@ template class Vector<int>;
 template Vector<double> &
 Vector<double>::operator=<int>(const dealii::Vector<int> &);
 template bool
-Vector<int>::operator==<int>(dealii::Vector<int> const &) const;
+Vector<int>::operator==<int>(const dealii::Vector<int> &) const;
 
 // instantiate for long double manually because we use it in a few places:
 template class Vector<long double>;

diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc
index d61405f461e430798c9ef5c1db6421853803a5ec..4d7de36ef998befcbf0ad435b60b0644b2614a02 100644 (file)
--- a/source/numerics/derivative_approximation.cc
+++ b/source/numerics/derivative_approximation.cc
@@ -918,13 +918,13 @@ namespace DerivativeApproximation
               int spacedim>
     void
     approximate(
-      SynchronousIterators<
+      const SynchronousIterators<
         std::tuple<typename DoFHandler<dim, spacedim>::active_cell_iterator,
-                   Vector<float>::iterator>> const &cell,
-      const Mapping<dim, spacedim> &                mapping,
-      const DoFHandler<dim, spacedim> &             dof_handler,
-      const InputVector &                           solution,
-      const unsigned int                            component)
+                   Vector<float>::iterator>> &cell,
+      const Mapping<dim, spacedim> &          mapping,
+      const DoFHandler<dim, spacedim> &       dof_handler,
+      const InputVector &                     solution,
+      const unsigned int                      component)
     {
       // if the cell is not locally owned, then there is nothing to do
       if (std::get<0>(*cell)->is_locally_owned() == false)
@@ -992,7 +992,7 @@ namespace DerivativeApproximation
         begin,
         end,
         [&mapping, &dof_handler, &solution, component](
-          SynchronousIterators<Iterators> const &cell,
+          const SynchronousIterators<Iterators> &cell,
           const Assembler::Scratch &,
           Assembler::CopyData &) {
           approximate<DerivativeDescription, dim, InputVector, spacedim>(

diff --git a/tests/base/time_stepping_01.cc b/tests/base/time_stepping_01.cc
index be33fa9d2c4f08b32dcf8ec47fcebe21640e7d53..27ce5c6d7a611fb3f02ba43dfe49146bbc179546 100644 (file)
--- a/tests/base/time_stepping_01.cc
+++ b/tests/base/time_stepping_01.cc
@@ -22,7 +22,7 @@
 #include "../tests.h"
 
 Vector<double>
-f1(double const t, Vector<double> const &y)
+f1(const double t, const Vector<double> &y)
 {
   Vector<double> values(y);
   for (unsigned int i = 0; i < values.size(); ++i)
@@ -32,7 +32,7 @@ f1(double const t, Vector<double> const &y)
 }
 
 Vector<double>
-f2(double const t, Vector<double> const &y)
+f2(const double t, const Vector<double> &y)
 {
   Vector<double> values(y);
   for (unsigned int i = 0; i < values.size(); ++i)
@@ -42,7 +42,7 @@ f2(double const t, Vector<double> const &y)
 }
 
 Vector<double>
-f3(double const t, Vector<double> const &y)
+f3(const double t, const Vector<double> &y)
 {
   Vector<double> values(y);
   for (unsigned int i = 0; i < values.size(); ++i)
@@ -52,7 +52,7 @@ f3(double const t, Vector<double> const &y)
 }
 
 Vector<double>
-f4(double const t, Vector<double> const &y)
+f4(const double t, const Vector<double> &y)
 {
   Vector<double> values(y);
   for (unsigned int i = 0; i < values.size(); ++i)
@@ -62,7 +62,7 @@ f4(double const t, Vector<double> const &y)
 }
 
 Vector<double>
-f5(double const t, Vector<double> const &y)
+f5(const double t, const Vector<double> &y)
 {
   Vector<double> values(y);
   for (unsigned int i = 0; i < values.size(); ++i)
@@ -73,7 +73,7 @@ f5(double const t, Vector<double> const &y)
 
 
 Vector<double>
-my_rhs_function(double const t, Vector<double> const &y)
+my_rhs_function(const double t, const Vector<double> &y)
 {
   Vector<double> values(y);
   for (unsigned int i = 0; i < values.size(); ++i)
@@ -83,78 +83,78 @@ my_rhs_function(double const t, Vector<double> const &y)
 }
 
 Vector<double>
-id_minus_tau_J_inv1(double const t, double const tau, Vector<double> const &y)
+id_minus_tau_J_inv1(const double t, const double tau, const Vector<double> &y)
 {
   return y;
 }
 
 Vector<double>
-id_minus_tau_J_inv2(double const t, double const tau, Vector<double> const &y)
+id_minus_tau_J_inv2(const double t, const double tau, const Vector<double> &y)
 {
   return y;
 }
 
 Vector<double>
-id_minus_tau_J_inv3(double const t, double const tau, Vector<double> const &y)
+id_minus_tau_J_inv3(const double t, const double tau, const Vector<double> &y)
 {
   return y;
 }
 
 Vector<double>
-id_minus_tau_J_inv4(double const t, double const tau, Vector<double> const &y)
+id_minus_tau_J_inv4(const double t, const double tau, const Vector<double> &y)
 {
   return y;
 }
 
 Vector<double>
-id_minus_tau_J_inv5(double const t, double const tau, Vector<double> const &y)
+id_minus_tau_J_inv5(const double t, const double tau, const Vector<double> &y)
 {
   return y;
 }
 
 double
-my1(double const t)
+my1(const double t)
 {
   return t;
 }
 
 double
-my2(double const t)
+my2(const double t)
 {
   return t * t;
 }
 
 double
-my3(double const t)
+my3(const double t)
 {
   return t * t * t;
 }
 
 double
-my4(double const t)
+my4(const double t)
 {
   return t * t * t * t;
 }
 
 double
-my5(double const t)
+my5(const double t)
 {
   return t * t * t * t * t;
 }
 
 double
-my_exact_solution(double const t)
+my_exact_solution(const double t)
 {
   return 0.1 * std::exp(t * t);
 }
 
 void
 test(TimeStepping::RungeKutta<Vector<double>> &                          solver,
-     std::function<Vector<double>(double const, Vector<double> const &)> f,
-     std::function<Vector<double>(double const,
-                                  double const,
-                                  Vector<double> const &)> id_minus_tau_J_inv,
-     std::function<double(double const)>                   my)
+     std::function<Vector<double>(const double, const Vector<double> &)> f,
+     std::function<Vector<double>(const double,
+                                  const double,
+                                  const Vector<double> &)> id_minus_tau_J_inv,
+     std::function<double(const double)>                   my)
 {
   unsigned int n_time_steps = 1;
   unsigned int size         = 1;
@@ -182,11 +182,11 @@ test(TimeStepping::RungeKutta<Vector<double>> &                          solver,
 
 void
 test2(TimeStepping::EmbeddedExplicitRungeKutta<Vector<double>> &solver,
-      std::function<Vector<double>(double const, Vector<double> const &)> f,
-      std::function<Vector<double>(double const,
-                                   double const,
-                                   Vector<double> const &)> id_minus_tau_J_inv,
-      std::function<double(double const)>                   my)
+      std::function<Vector<double>(const double, const Vector<double> &)> f,
+      std::function<Vector<double>(const double,
+                                   const double,
+                                   const Vector<double> &)> id_minus_tau_J_inv,
+      std::function<double(const double)>                   my)
 {
   double         initial_time = 0.0, final_time = 1.0;
   double         time_step    = 1.0;
@@ -221,11 +221,11 @@ test2(TimeStepping::EmbeddedExplicitRungeKutta<Vector<double>> &solver,
 void
 test_convergence(
   TimeStepping::RungeKutta<Vector<double>> &                          solver,
-  std::function<Vector<double>(double const, Vector<double> const &)> f,
-  std::function<Vector<double>(double const,
-                               double const,
-                               Vector<double> const &)> id_minus_tau_J_inv,
-  std::function<double(double const)>                   my)
+  std::function<Vector<double>(const double, const Vector<double> &)> f,
+  std::function<Vector<double>(const double,
+                               const double,
+                               const Vector<double> &)> id_minus_tau_J_inv,
+  std::function<double(const double)>                   my)
 {
   std::vector<double> errors;
   double              initial_time = 0.0, final_time = 1.0;

diff --git a/tests/base/time_stepping_02.cc b/tests/base/time_stepping_02.cc
index 6e56899f4ca16449d2862ec1007ed0b7b8ebecf2..235d063e28194b598de3269687d43a3b3908a550 100644 (file)
--- a/tests/base/time_stepping_02.cc
+++ b/tests/base/time_stepping_02.cc
@@ -24,7 +24,7 @@
 #include "../tests.h"
 
 Vector<double>
-f(double const t, Vector<double> const &y)
+f(const double t, const Vector<double> &y)
 {
   Vector<double> values(y);
   for (unsigned int i = 0; i < values.size(); ++i)
@@ -34,15 +34,15 @@ f(double const t, Vector<double> const &y)
 }
 
 double
-my(double const t)
+my(const double t)
 {
   return t;
 }
 
 void
 test(TimeStepping::EmbeddedExplicitRungeKutta<Vector<double>> &          solver,
-     std::function<Vector<double>(double const, Vector<double> const &)> f,
-     std::function<double(double const)>                                 my)
+     std::function<Vector<double>(const double, const Vector<double> &)> f,
+     std::function<double(const double)>                                 my)
 {
   double         initial_time = 0.0, final_time = 1.0;
   double         time_step    = 0.1;

diff --git a/tests/cuda/solver_02.cc b/tests/cuda/solver_02.cc
index a38b5e230e81f8c2e0023f99a8d796b91adea294..331f987fec48270289fe828c8360154d2dc6191c 100644 (file)
--- a/tests/cuda/solver_02.cc
+++ b/tests/cuda/solver_02.cc
@@ -35,7 +35,7 @@ test(Utilities::CUDA::Handle &cuda_handle)
   // Create the matrix on the host.
   dealii::SparsityPattern                sparsity_pattern;
   dealii::SparseMatrix<double>           matrix;
-  unsigned int const                     size = 30;
+  const unsigned int                     size = 30;
   std::vector<std::vector<unsigned int>> column_indices(size);
   for (unsigned int i = 0; i < size; ++i)
     {

diff --git a/tests/cuda/sparse_matrix_01.cc b/tests/cuda/sparse_matrix_01.cc
index f9ffa651f02dec4125a6c3dbd22741dd01f8759d..c708b90ee42f63e5ed4cdb470a8bdd73c5de2b2c 100644 (file)
--- a/tests/cuda/sparse_matrix_01.cc
+++ b/tests/cuda/sparse_matrix_01.cc
@@ -28,7 +28,7 @@
 
 
 void
-check_matrix(SparseMatrix<double> const &        A,
+check_matrix(const SparseMatrix<double> &        A,
              CUDAWrappers::SparseMatrix<double> &A_dev)
 {
   cudaError_t cuda_error_code;
@@ -53,7 +53,7 @@ check_matrix(SparseMatrix<double> const &        A,
                                cudaMemcpyDeviceToHost);
   AssertCuda(cuda_error_code);
 
-  int const        n_rows = A_dev.m() + 1;
+  const int        n_rows = A_dev.m() + 1;
   std::vector<int> row_ptr_host(n_rows + 1);
   cuda_error_code = cudaMemcpy(&row_ptr_host[0],
                                row_ptr_dev,
@@ -68,8 +68,8 @@ check_matrix(SparseMatrix<double> const &        A,
 }
 
 void
-check_vector(Vector<double> const &                        a,
-             LinearAlgebra::ReadWriteVector<double> const &b)
+check_vector(const Vector<double> &                        a,
+             const LinearAlgebra::ReadWriteVector<double> &b)
 {
   unsigned int size = a.size();
   for (unsigned int i = 0; i < size; ++i)

diff --git a/tests/grid/grid_generator_open_torus.cc b/tests/grid/grid_generator_open_torus.cc
index bd9553de8cbc64567bd89a6b70207059ff172e6f..55e148e3c95b0d3ad6c8fb3331b38cee1a522a40 100644 (file)
--- a/tests/grid/grid_generator_open_torus.cc
+++ b/tests/grid/grid_generator_open_torus.cc
@@ -38,22 +38,22 @@ void
 test()
 {
   Triangulation<3>   tria;
-  unsigned int const n_cells_toroidal = 9;
-  double const       angle            = 2.0 * numbers::PI;
-  double const       R = 3., r = 1.;
+  const unsigned int n_cells_toroidal = 9;
+  const double       angle            = 2.0 * numbers::PI;
+  const double       R = 3., r = 1.;
   GridGenerator::torus(tria, R, r, n_cells_toroidal, angle);
 
   Triangulation<3>   tria_open;
-  unsigned int const factor = 3;
+  const unsigned int factor = 3;
   GridGenerator::torus(
     tria_open, R, r, n_cells_toroidal / factor, angle / (double)factor);
 
-  MappingQ<3> const mapping(3);
-  QGauss<3> const   gauss(4);
+  const MappingQ<3> mapping(3);
+  const QGauss<3>   gauss(4);
 
-  double const ar_full_torus =
+  const double ar_full_torus =
     GridTools::compute_maximum_aspect_ratio(mapping, tria, gauss);
-  double const ar_open_torus =
+  const double ar_open_torus =
     GridTools::compute_maximum_aspect_ratio(mapping, tria_open, gauss);
 
   deallog << "N_active_cells_full = " << tria.n_global_active_cells()

diff --git a/tests/grid/grid_tools_aspect_ratio.cc b/tests/grid/grid_tools_aspect_ratio.cc
index 996ad8190578be411489e693c97b92816e6470ae..1de69fd48335a74ee269991a72d30678942948ae 100644 (file)
--- a/tests/grid/grid_tools_aspect_ratio.cc
+++ b/tests/grid/grid_tools_aspect_ratio.cc
@@ -50,9 +50,9 @@
 template <int dim>
 double
 compute_aspect_ratio_hyper_rectangle(
-  Point<dim> const &               left,
-  Point<dim> const &               right,
-  std::vector<unsigned int> const &refinements,
+  const Point<dim> &               left,
+  const Point<dim> &               right,
+  const std::vector<unsigned int> &refinements,
   unsigned int                     degree     = 1,
   unsigned int                     n_q_points = 2,
   bool                             deform     = false,
@@ -72,8 +72,8 @@ compute_aspect_ratio_hyper_rectangle(
       tria.begin_active()->vertex(0) += shift;
     }
 
-  MappingQ<dim> const mapping(degree);
-  QGauss<dim> const   gauss(n_q_points);
+  const MappingQ<dim> mapping(degree);
+  const QGauss<dim>   gauss(n_q_points);
 
   Vector<double> ratios =
     GridTools::compute_aspect_ratio_of_cells(mapping, tria, gauss);

diff --git a/tests/lac/sparse_matrix_print.cc b/tests/lac/sparse_matrix_print.cc
index de6b4086e5f620d18fdb8f91f4f8cf6aa1f03735..c0085ccf8aae105d3b3973595cfa3392947c07d5 100644 (file)
--- a/tests/lac/sparse_matrix_print.cc
+++ b/tests/lac/sparse_matrix_print.cc
@@ -26,7 +26,7 @@ template <typename number>
 void
 print_sparse_matrix()
 {
-  unsigned int const n = 20;
+  const unsigned int n = 20;
   SparsityPattern    sp(n, n);
   for (unsigned int i = 0; i < n; ++i)
     for (unsigned int j = 0; j < n; ++j)

diff --git a/tests/manifold/transfinite_manifold_10.cc b/tests/manifold/transfinite_manifold_10.cc
index 5721d9bb2a164b80bbf880ce311d4d34f14ff480..cc892aa05fa1e512798239f55032222aa5f432bf 100644 (file)
--- a/tests/manifold/transfinite_manifold_10.cc
+++ b/tests/manifold/transfinite_manifold_10.cc
@@ -75,8 +75,8 @@ main()
   const unsigned int n_cells = 3;
 
   // the first 8 vertices are in the x-y-plane
-  Point<3> const        p = Point<3>(R, 0.0, 0.0);
-  double const          a = 1. / (1 + std::sqrt(2.0));
+  const Point<3>        p = Point<3>(R, 0.0, 0.0);
+  const double          a = 1. / (1 + std::sqrt(2.0));
   std::vector<Point<3>> vertices(8 * n_cells);
   vertices[0] = p + Point<3>(-1, -1, 0) * (r / std::sqrt(2.0)),
   vertices[1] = p + Point<3>(+1, -1, 0) * (r / std::sqrt(2.0)),
@@ -93,7 +93,7 @@ main()
     {
       for (unsigned int v = 0; v < 8; ++v)
         {
-          double const r_2d      = vertices[v][0];
+          const double r_2d      = vertices[v][0];
           vertices[8 * c + v][0] = r_2d * std::cos(phi_cell * c);
           vertices[8 * c + v][1] = vertices[v][1];
           vertices[8 * c + v][2] = r_2d * std::sin(phi_cell * c);

diff --git a/tests/mappings/mapping_get_vertices_on_face.cc b/tests/mappings/mapping_get_vertices_on_face.cc
index 76a6a01227b02ea0cce274d2537a60d32a6761ab..2e57ad08f421b364a43a6cdaa74436cb02729e22 100644 (file)
--- a/tests/mappings/mapping_get_vertices_on_face.cc
+++ b/tests/mappings/mapping_get_vertices_on_face.cc
@@ -62,7 +62,7 @@ test_vertex_order()
 
         for (unsigned int i = 0; i < vertices.size(); ++i)
           {
-            auto const diff = vertices[i] - vertices_detour[i];
+            const auto diff = vertices[i] - vertices_detour[i];
             AssertThrow(diff.norm() < 1e-12, ExcMessage("Vertices differ!"));
           }
       }

diff --git a/tests/matrix_free/coefficient_eval_device.cc b/tests/matrix_free/coefficient_eval_device.cc
index e733a2b8fc2171ec935b4dad969259d1da121710..deaf77242fac64ba78b371f3423f827ea84a10fc 100644 (file)
--- a/tests/matrix_free/coefficient_eval_device.cc
+++ b/tests/matrix_free/coefficient_eval_device.cc
@@ -151,19 +151,19 @@ test()
 
   // Computation the host
   auto               graph    = mf_data.get_colored_graph();
-  unsigned int const n_colors = graph.size();
+  const unsigned int n_colors = graph.size();
   for (unsigned int color = 0; color < n_colors; ++color)
     {
       typename CUDAWrappers::MatrixFree<dim, double>::Data gpu_data =
         mf_data.get_data(color);
-      unsigned int const n_cells = gpu_data.n_cells;
+      const unsigned int n_cells = gpu_data.n_cells;
       auto gpu_data_host = CUDAWrappers::copy_mf_data_to_host<dim, double>(
         gpu_data, additional_data.mapping_update_flags);
       for (unsigned int cell_id = 0; cell_id < n_cells; ++cell_id)
         {
           for (unsigned int i = 0; i < n_q_points_per_cell; ++i)
             {
-              unsigned int const pos =
+              const unsigned int pos =
                 gpu_data_host.local_q_point_id(cell_id, n_q_points_per_cell, i);
               auto         p = gpu_data_host.get_quadrature_point(cell_id, i);
               const double p_val = dim == 2 ? p(0) + p(1) : p(0) + p(1) + p(2);

diff --git a/tests/matrix_free/matrix_vector_rt_04.cc b/tests/matrix_free/matrix_vector_rt_04.cc
index fe116778631d6530959f38b0755fee601c81f35b..e4ad5db4774b8eae26146ee794b4b3530ccb880a 100644 (file)
--- a/tests/matrix_free/matrix_vector_rt_04.cc
+++ b/tests/matrix_free/matrix_vector_rt_04.cc
@@ -30,10 +30,10 @@ template <int dim>
 class DeformedCubeManifold : public dealii::ChartManifold<dim, dim, dim>
 {
 public:
-  DeformedCubeManifold(double const       left,
-                       double const       right,
-                       double const       deformation,
-                       unsigned int const frequency = 1)
+  DeformedCubeManifold(const double       left,
+                       const double       right,
+                       const double       deformation,
+                       const unsigned int frequency = 1)
     : left(left)
     , right(right)
     , deformation(deformation)
@@ -41,7 +41,7 @@ public:
   {}
 
   dealii::Point<dim>
-  push_forward(dealii::Point<dim> const &chart_point) const override
+  push_forward(const dealii::Point<dim> &chart_point) const override
   {
     double sinval = deformation;
     for (unsigned int d = 0; d < dim; ++d)
@@ -54,7 +54,7 @@ public:
   }
 
   dealii::Point<dim>
-  pull_back(dealii::Point<dim> const &space_point) const override
+  pull_back(const dealii::Point<dim> &space_point) const override
   {
     dealii::Point<dim> x = space_point;
     dealii::Point<dim> one;
@@ -117,10 +117,10 @@ public:
   }
 
 private:
-  double const       left;
-  double const       right;
-  double const       deformation;
-  unsigned int const frequency;
+  const double       left;
+  const double       right;
+  const double       deformation;
+  const unsigned int frequency;
 };
 
 template <int dim, int fe_degree>
@@ -130,8 +130,8 @@ test()
   Triangulation<dim> tria;
   GridGenerator::hyper_cube(tria);
   tria.refine_global(2);
-  unsigned int const               frequency   = 2;
-  double const                     deformation = 0.05;
+  const unsigned int               frequency   = 2;
+  const double                     deformation = 0.05;
   static DeformedCubeManifold<dim> manifold(0.0, 1.0, deformation, frequency);
   tria.set_all_manifold_ids(1);
   tria.set_manifold(1, manifold);

diff --git a/tests/matrix_free/matrix_vector_rt_common.h b/tests/matrix_free/matrix_vector_rt_common.h
index 64798807aecf1a1858ab1fd2c50f3bfcb26473c4..ce6d8644d045ceb0eca6ca8e66aed33c9c4accd6 100644 (file)
--- a/tests/matrix_free/matrix_vector_rt_common.h
+++ b/tests/matrix_free/matrix_vector_rt_common.h
@@ -70,7 +70,7 @@ enum TestType : unsigned char
 };
 
 std::string
-enum_to_string(TestType const enum_type)
+enum_to_string(const TestType enum_type)
 {
   std::string string_type;
   switch (enum_type)

diff --git a/tests/matrix_free/matrix_vector_rt_face_04.cc b/tests/matrix_free/matrix_vector_rt_face_04.cc
index 9f100a4b0a18b2f9d366426227dc9e6b6d1ad7cc..781730776e849456d257cf6143fa191a4d40e765 100644 (file)
--- a/tests/matrix_free/matrix_vector_rt_face_04.cc
+++ b/tests/matrix_free/matrix_vector_rt_face_04.cc
@@ -31,10 +31,10 @@ template <int dim>
 class DeformedCubeManifold : public dealii::ChartManifold<dim, dim, dim>
 {
 public:
-  DeformedCubeManifold(double const       left,
-                       double const       right,
-                       double const       deformation,
-                       unsigned int const frequency = 1)
+  DeformedCubeManifold(const double       left,
+                       const double       right,
+                       const double       deformation,
+                       const unsigned int frequency = 1)
     : left(left)
     , right(right)
     , deformation(deformation)
@@ -42,7 +42,7 @@ public:
   {}
 
   dealii::Point<dim>
-  push_forward(dealii::Point<dim> const &chart_point) const override
+  push_forward(const dealii::Point<dim> &chart_point) const override
   {
     double sinval = deformation;
     for (unsigned int d = 0; d < dim; ++d)
@@ -55,7 +55,7 @@ public:
   }
 
   dealii::Point<dim>
-  pull_back(dealii::Point<dim> const &space_point) const override
+  pull_back(const dealii::Point<dim> &space_point) const override
   {
     dealii::Point<dim> x = space_point;
     dealii::Point<dim> one;
@@ -118,10 +118,10 @@ public:
   }
 
 private:
-  double const       left;
-  double const       right;
-  double const       deformation;
-  unsigned int const frequency;
+  const double       left;
+  const double       right;
+  const double       deformation;
+  const unsigned int frequency;
 };
 
 template <int dim, int fe_degree>
@@ -131,8 +131,8 @@ test()
   Triangulation<dim> tria;
   GridGenerator::hyper_cube(tria);
   tria.refine_global(2);
-  unsigned int const               frequency   = 2;
-  double const                     deformation = 0.05;
+  const unsigned int               frequency   = 2;
+  const double                     deformation = 0.05;
   static DeformedCubeManifold<dim> manifold(0.0, 1.0, deformation, frequency);
   tria.set_all_manifold_ids(1);
   tria.set_manifold(1, manifold);

diff --git a/tests/matrix_free/matrix_vector_rt_face_common.h b/tests/matrix_free/matrix_vector_rt_face_common.h
index 8a75ea7415ec82f5a792ca5a39e1472fa371b2bc..34a6c1bead79ebc677f9eb2ee683b601998c2e0e 100644 (file)
--- a/tests/matrix_free/matrix_vector_rt_face_common.h
+++ b/tests/matrix_free/matrix_vector_rt_face_common.h
@@ -70,7 +70,7 @@ enum TestType : unsigned char
 };
 
 std::string
-enum_to_string(TestType const enum_type)
+enum_to_string(const TestType enum_type)
 {
   std::string string_type;
   switch (enum_type)

diff --git a/tests/particles/properties_01.cc b/tests/particles/properties_01.cc
index 4401e8458b388e0959ee0b9062ebf825b3e797ed..cc10d4fe0832a18b7787312ca79393d410c8cdff 100644 (file)
--- a/tests/particles/properties_01.cc
+++ b/tests/particles/properties_01.cc
@@ -47,7 +47,7 @@ public:
   {}
 
   inline virtual void
-  vector_value(Point<dim> const &p, Vector<double> &values) const override
+  vector_value(const Point<dim> &p, Vector<double> &values) const override
   {
     for (unsigned int i = 0; i < dim; ++i)
       {

diff --git a/tests/particles/properties_02.cc b/tests/particles/properties_02.cc
index cb14ffd4e7ed263254f2f6bace0931a17d29f0cc..dc06ed80165f335b3764eb701b1c7c2bc3de01e9 100644 (file)
--- a/tests/particles/properties_02.cc
+++ b/tests/particles/properties_02.cc
@@ -51,7 +51,7 @@ public:
   {}
 
   inline virtual void
-  vector_value(Point<dim> const &p, Vector<double> &values) const override
+  vector_value(const Point<dim> &p, Vector<double> &values) const override
   {
     for (unsigned int i = 0; i < dim; ++i)
       {

diff --git a/tests/remote_point_evaluation/search_adjacent_cells.cc b/tests/remote_point_evaluation/search_adjacent_cells.cc
index 9ea900755da7de7cc41ffaee85ab36fdcd1583d1..14f760ff41ae74477c3abe032ddaff77d3ef90d1 100644 (file)
--- a/tests/remote_point_evaluation/search_adjacent_cells.cc
+++ b/tests/remote_point_evaluation/search_adjacent_cells.cc
@@ -53,19 +53,19 @@ template <int dim>
 void
 construct_triangulation(Triangulation<dim> &tria)
 {
-  double const L_F = 0.7;
-  double const B_F = 1.0;
-  double const H_F = 0.5;
+  const double L_F = 0.7;
+  const double B_F = 1.0;
+  const double H_F = 0.5;
 
-  double const T_S = 0.05;
-  double const B_S = 0.6;
-  double const H_S = 0.4;
+  const double T_S = 0.05;
+  const double B_S = 0.6;
+  const double H_S = 0.4;
 
-  double const L_IN = 0.6;
+  const double L_IN = 0.6;
 
-  unsigned int const N_CELLS_X_OUTFLOW = 1;
-  unsigned int const N_CELLS_Y_LOWER   = 2;
-  unsigned int const N_CELLS_Z_MIDDLE  = 2;
+  const unsigned int N_CELLS_X_OUTFLOW = 1;
+  const unsigned int N_CELLS_Y_LOWER   = 2;
+  const unsigned int N_CELLS_Z_MIDDLE  = 2;
 
   std::vector<dealii::Triangulation<3>> tria_vec;
   tria_vec.resize(4);
@@ -95,7 +95,7 @@ construct_triangulation(Triangulation<dim> &tria)
     dealii::Point<3>(L_IN, -H_F / 2.0, -B_F / 2.0),
     dealii::Point<3>(L_IN + T_S, H_S - H_F / 2.0, -B_S / 2.0));
 
-  std::vector<dealii::Triangulation<3> const *> tria_vec_ptr(tria_vec.size());
+  std::vector<const dealii::Triangulation<3> *> tria_vec_ptr(tria_vec.size());
   for (unsigned int i = 0; i < tria_vec.size(); ++i)
     tria_vec_ptr[i] = &tria_vec[i];
 
@@ -224,7 +224,7 @@ test(const unsigned int mapping_degree,
 
       // enclosing dummy triangulation for point plots
       dealii::BoundingBox<dim> bounding_box(points);
-      auto const               boundary_points =
+      const auto               boundary_points =
         bounding_box.create_extended_relative(1e-3).get_boundary_points();
 
       dealii::Triangulation<dim> particle_dummy_tria;

diff --git a/tests/tensors/tensor_accessors_01.cc b/tests/tensors/tensor_accessors_01.cc
index 4e2810add09e5a4c236a497b05a06649848151a7..d78d8ee1896f706e1b931bb3182e92ca767ac694 100644 (file)
--- a/tests/tensors/tensor_accessors_01.cc
+++ b/tests/tensors/tensor_accessors_01.cc
@@ -150,7 +150,7 @@ main()
 
     const double(&t_ref)[3][3][3][3][3] = t;
     dealii::TensorAccessors::internal::
-      ReorderedIndexView<2, 5, double const[3][3][3][3][3]> // auto ...
+      ReorderedIndexView<2, 5, const double[3][3][3][3][3]> // auto ...
         foo2 = TensorAccessors::reordered_index_view<2, 5>(t_ref);
     deallog << foo2[0][1][0][1][2] << std::endl;
   }

diff --git a/tests/trilinos/assemble_matrix_parallel_02.cc b/tests/trilinos/assemble_matrix_parallel_02.cc
index 7f9c3fb3386b6100ad4fccf78b3fdba829a198c5..aa07a29351828ce2bcd7e673c5f6a0ffe651a8ed 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_02.cc
+++ b/tests/trilinos/assemble_matrix_parallel_02.cc
@@ -132,7 +132,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+    const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator>
       &cell) const;
 
   parallel::distributed::Triangulation<dim> triangulation;
@@ -226,7 +226,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &cell)
+  const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> &cell)
   const
 {
   std::vector<types::global_dof_index> local_dof_indices(
@@ -268,7 +268,7 @@ LaplaceProblem<dim>::setup_system()
     begin,
     end,
     static_cast<std::function<std::vector<types::global_dof_index>(
-      FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+      const FilteredIterator<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_03.cc b/tests/trilinos/assemble_matrix_parallel_03.cc
index d5e542793cd8d63d025c538f9cc4e526e5a5995e..d30d7818dda4765dd3dd78974572f8ff51406c99 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_03.cc
+++ b/tests/trilinos/assemble_matrix_parallel_03.cc
@@ -133,7 +133,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+    const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator>
       &cell) const;
 
   parallel::distributed::Triangulation<dim> triangulation;
@@ -227,7 +227,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &cell)
+  const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> &cell)
   const
 {
   std::vector<types::global_dof_index> local_dof_indices(
@@ -269,7 +269,7 @@ LaplaceProblem<dim>::setup_system()
     begin,
     end,
     static_cast<std::function<std::vector<types::global_dof_index>(
-      FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+      const FilteredIterator<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_04.cc b/tests/trilinos/assemble_matrix_parallel_04.cc
index 1aa96afcedbfc5ba4f08af97256abb65425adc30..029c67deb66210205806ad215c8d49ebec3230d0 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_04.cc
+++ b/tests/trilinos/assemble_matrix_parallel_04.cc
@@ -134,7 +134,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+    const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator>
       &cell) const;
 
   parallel::distributed::Triangulation<dim> triangulation;
@@ -228,7 +228,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &cell)
+  const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> &cell)
   const
 {
   std::vector<types::global_dof_index> local_dof_indices(
@@ -273,7 +273,7 @@ LaplaceProblem<dim>::setup_system()
     begin,
     end,
     static_cast<std::function<std::vector<types::global_dof_index>(
-      FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+      const FilteredIterator<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_05.cc b/tests/trilinos/assemble_matrix_parallel_05.cc
index 4914bccc27726db57bf8c7d4365442b5ebd9761f..e4d53ede4dd4eee6d8550673066bd071ff0c514b 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_05.cc
+++ b/tests/trilinos/assemble_matrix_parallel_05.cc
@@ -134,7 +134,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+    const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator>
       &cell) const;
 
   parallel::distributed::Triangulation<dim> triangulation;
@@ -228,7 +228,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &cell)
+  const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> &cell)
   const
 {
   std::vector<types::global_dof_index> local_dof_indices(
@@ -270,7 +270,7 @@ LaplaceProblem<dim>::setup_system()
     begin,
     end,
     static_cast<std::function<std::vector<types::global_dof_index>(
-      FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+      const FilteredIterator<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_06.cc b/tests/trilinos/assemble_matrix_parallel_06.cc
index 36122c73bb47a2b78a864f73636ab5ec2342795e..603ba586229ee725588aa58548065fadf6de082b 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_06.cc
+++ b/tests/trilinos/assemble_matrix_parallel_06.cc
@@ -136,7 +136,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+    const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator>
       &cell) const;
 
   parallel::distributed::Triangulation<dim> triangulation;
@@ -230,7 +230,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &cell)
+  const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> &cell)
   const
 {
   std::vector<types::global_dof_index> local_dof_indices(
@@ -275,7 +275,7 @@ LaplaceProblem<dim>::setup_system()
     begin,
     end,
     static_cast<std::function<std::vector<types::global_dof_index>(
-      FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+      const FilteredIterator<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_07.cc b/tests/trilinos/assemble_matrix_parallel_07.cc
index 6cbd60786e5eb5f13714265de38e85aed5c6eb3c..23c466bbb661cd670a04f1ff10b5bcab8eb274d4 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_07.cc
+++ b/tests/trilinos/assemble_matrix_parallel_07.cc
@@ -133,7 +133,7 @@ private:
 
   std::vector<types::global_dof_index>
   get_conflict_indices(
-    FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+    const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator>
       &cell) const;
 
   parallel::distributed::Triangulation<dim> triangulation;
@@ -227,7 +227,7 @@ LaplaceProblem<dim>::~LaplaceProblem()
 template <int dim>
 std::vector<types::global_dof_index>
 LaplaceProblem<dim>::get_conflict_indices(
-  FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const &cell)
+  const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> &cell)
   const
 {
   std::vector<types::global_dof_index> local_dof_indices(
@@ -269,7 +269,7 @@ LaplaceProblem<dim>::setup_system()
     begin,
     end,
     static_cast<std::function<std::vector<types::global_dof_index>(
-      FilteredIterator<typename DoFHandler<dim>::active_cell_iterator> const
+      const FilteredIterator<typename DoFHandler<dim>::active_cell_iterator>
         &)>>(std::bind(&LaplaceProblem<dim>::get_conflict_indices,
                        this,
                        std::placeholders::_1)));