From d512e44e92c9a4d79f9af81ba0c1971a3c047f34 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Fri, 2 Jun 2017 10:32:36 -0600
Subject: [PATCH] Change some indentation oddities.

The majority of these are related to space before comma. I did all of
this by first running astyle 3.0.1 to see what it changes, and then
running astyle 2.04 as usual again. 3.0.1 fixes up a few oddities
that 2.04 doesn't undo, and most of these are probably worthwhile
keeping.

There are some corner cases where we had purposefully aligned commas
with leading spaces, and one could consider not making this change,
or updating it by hand. But I don't feel strongly enough about
this to really go to lengths here.
---
 examples/step-24/step-24.cc                   |  2 +-
 examples/step-45/step-45.cc                   |  2 +-
 examples/step-47/step-47.cc                   |  2 +-
 include/deal.II/base/tensor_deprecated.h      |  8 +-
 include/deal.II/dofs/dof_accessor.templates.h |  8 +-
 include/deal.II/fe/fe_poly_face.templates.h   |  2 +-
 include/deal.II/grid/tria.h                   |  2 +-
 .../deal.II/grid/tria_accessor.templates.h    |  4 +-
 include/deal.II/lac/block_sparsity_pattern.h  | 10 +--
 include/deal.II/lac/diagonal_matrix.h         |  2 +-
 include/deal.II/lac/la_vector.templates.h     |  2 +-
 include/deal.II/lac/solver_gmres.h            |  2 +-
 .../deal.II/matrix_free/evaluation_kernels.h  |  2 +-
 include/deal.II/matrix_free/matrix_free.h     | 40 +++++-----
 include/deal.II/meshworker/assembler.h        |  4 +-
 .../deal.II/numerics/vector_tools.templates.h |  6 +-
 include/deal.II/physics/transformations.h     |  4 +-
 source/base/tensor_product_polynomials.cc     |  6 +-
 .../tensor_product_polynomials_bubbles.cc     |  2 +-
 .../base/tensor_product_polynomials_const.cc  |  2 +-
 source/dofs/dof_tools_constraints.inst.in     |  4 +-
 source/fe/fe.cc                               |  2 +-
 source/fe/fe_dgp.cc                           |  2 +-
 source/fe/fe_dgp_monomial.cc                  |  2 +-
 source/fe/fe_dgp_nonparametric.cc             | 10 +--
 source/fe/fe_dgq.cc                           |  2 +-
 source/fe/fe_face.cc                          |  8 +-
 source/fe/fe_nothing.cc                       |  8 +-
 source/fe/fe_p1nc.cc                          |  2 +-
 source/fe/fe_poly_tensor.cc                   |  2 +-
 source/fe/fe_q_base.cc                        |  2 +-
 source/fe/fe_system.cc                        |  4 +-
 source/fe/fe_tools.inst.in                    |  6 +-
 source/fe/fe_values.cc                        |  2 +-
 source/fe/mapping_fe_field.cc                 |  4 +-
 source/fe/mapping_q.cc                        |  4 +-
 source/fe/mapping_q1_eulerian.cc              |  2 +-
 source/fe/mapping_q_eulerian.cc               |  2 +-
 source/grid/grid_generator.cc                 | 74 +++++++++----------
 source/grid/grid_tools.cc                     | 20 ++---
 source/grid/grid_tools.inst.in                |  2 +-
 source/grid/tria.cc                           | 10 +--
 source/lac/constraint_matrix.cc               |  2 +-
 source/lac/petsc_parallel_sparse_matrix.cc    |  4 +-
 source/lac/petsc_precondition.cc              |  4 +-
 source/lac/sparsity_pattern.cc                |  2 +-
 source/lac/trilinos_sparse_matrix.cc          |  2 +-
 source/numerics/error_estimator.inst.in       | 16 ++--
 source/numerics/error_estimator_1d.inst.in    | 16 ++--
 source/opencascade/utilities.cc               |  2 +-
 tests/base/product_type_04.cc                 |  4 +-
 tests/base/product_type_04_symmetric.cc       |  2 +-
 tests/dofs/interpolate_q_system_02.cc         |  2 +-
 tests/dofs/interpolate_q_system_mask_02.cc    |  2 +-
 tests/fe/fe_enriched_compare_to_fe_system.cc  |  2 +-
 .../fe/fe_enriched_compare_to_fe_system_2.cc  |  6 +-
 tests/full_matrix/full_matrix_56.cc           |  2 +-
 tests/gla/vec_03.cc                           |  2 +-
 .../grid/build_triangulation_from_patch_01.cc |  2 +-
 .../grid/build_triangulation_from_patch_02.cc |  2 +-
 .../grid/build_triangulation_from_patch_03.cc |  2 +-
 .../grid/build_triangulation_from_patch_04.cc |  2 +-
 .../get_cells_at_coarsest_common_level_02.cc  |  2 +-
 tests/grid/grid_test.cc                       |  2 +-
 tests/hp/fe_nothing_18.cc                     |  4 +-
 tests/integrators/advection_01.cc             |  4 +-
 tests/lac/constraints.cc                      |  2 +-
 tests/lac/schur_complement_05.cc              |  2 +-
 tests/matrix_free/create_mesh.h               |  4 +-
 tests/matrix_free/matrix_vector_stokes.cc     |  2 +-
 .../matrix_free/matrix_vector_stokes_qdg0.cc  |  2 +-
 tests/mpi/muelu_periodicity.cc                |  2 +-
 tests/mpi/periodic_neighbor_01.cc             |  2 +-
 tests/mpi/periodicity_02.cc                   |  2 +-
 tests/mpi/periodicity_03.cc                   |  2 +-
 .../trilinos/trilinos_sparsity_pattern_02.cc  |  2 +-
 76 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/examples/step-24/step-24.cc b/examples/step-24/step-24.cc
index 4ac23f64bf..c97e9dd8f2 100644
--- a/examples/step-24/step-24.cc
+++ b/examples/step-24/step-24.cc
@@ -518,7 +518,7 @@ namespace Step24
         G2.add (wave_speed, tmp);
 
         system_rhs_p = G1;
-        system_rhs_p.add(time_step * theta , G2);
+        system_rhs_p.add(time_step * theta, G2);
 
         solve_p ();
 
diff --git a/examples/step-45/step-45.cc b/examples/step-45/step-45.cc
index e54b220b57..a14ff40b1c 100644
--- a/examples/step-45/step-45.cc
+++ b/examples/step-45/step-45.cc
@@ -294,7 +294,7 @@ namespace Step45
     mpi_communicator (MPI_COMM_WORLD),
     triangulation (mpi_communicator),
     fe (FE_Q<dim>(degree+1), dim,
-        FE_Q<dim>(degree)  , 1),
+        FE_Q<dim>(degree), 1),
     dof_handler (triangulation),
     pcout (std::cout,
            Utilities::MPI::this_mpi_process(mpi_communicator) == 0),
diff --git a/examples/step-47/step-47.cc b/examples/step-47/step-47.cc
index 18d23d13fd..62712a3536 100644
--- a/examples/step-47/step-47.cc
+++ b/examples/step-47/step-47.cc
@@ -86,7 +86,7 @@ namespace Step47
     bool interface_intersects_cell (const typename Triangulation<dim>::cell_iterator &cell) const;
     std::pair<unsigned int, Quadrature<dim> > compute_quadrature(const Quadrature<dim> &plain_quadrature, const typename hp::DoFHandler<dim>::active_cell_iterator &cell, const std::vector<double> &level_set_values);
     void append_quadrature(const Quadrature<dim> &plain_quadrature,
-                           const std::vector<Point<dim> > &v      ,
+                           const std::vector<Point<dim> > &v,
                            std::vector<Point<dim> > &xfem_points,
                            std::vector<double>      &xfem_weights);
 
diff --git a/include/deal.II/base/tensor_deprecated.h b/include/deal.II/base/tensor_deprecated.h
index 6f3ac96ac9..3e55e37591 100644
--- a/include/deal.II/base/tensor_deprecated.h
+++ b/include/deal.II/base/tensor_deprecated.h
@@ -132,8 +132,8 @@ void contract (Tensor<3,dim,Number>       &dest,
 template <int rank_1, int rank_2, int dim, typename Number>
 inline
 void contract (Tensor<rank_1 + rank_2 - 2, dim, Number> &dest,
-               const Tensor<rank_1 ,dim, Number>        &src1,
-               const Tensor<rank_2 ,dim, Number>        &src2) DEAL_II_DEPRECATED;
+               const Tensor<rank_1, dim, Number>        &src1,
+               const Tensor<rank_2, dim, Number>        &src2) DEAL_II_DEPRECATED;
 
 /**
  * Contract a tensor of rank 1 with a tensor of rank 1 and return the result.
@@ -433,8 +433,8 @@ void contract (Tensor<3,dim,Number>       &dest,
 template <int rank_1, int rank_2, int dim, typename Number>
 inline
 void contract (Tensor<rank_1 + rank_2 - 2, dim, Number> &dest,
-               const Tensor<rank_1 ,dim, Number>        &src1,
-               const Tensor<rank_2 ,dim, Number>        &src2)
+               const Tensor<rank_1, dim, Number>        &src1,
+               const Tensor<rank_2, dim, Number>        &src2)
 {
   TensorAccessors::internal::ReorderedIndexView<0, rank_2, const Tensor<rank_2, dim, Number> >
   reordered = TensorAccessors::reordered_index_view<0, rank_2>(src2);
diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h
index 5a082e200c..ea91aa3caf 100644
--- a/include/deal.II/dofs/dof_accessor.templates.h
+++ b/include/deal.II/dofs/dof_accessor.templates.h
@@ -867,7 +867,7 @@ namespace internal
       static
       unsigned int
       n_active_fe_indices (const dealii::hp::DoFHandler<2,spacedim> &dof_handler,
-                           const unsigned int ,
+                           const unsigned int,
                            const unsigned int obj_index,
                            const dealii::internal::int2type<1> &)
       {
@@ -1017,7 +1017,7 @@ namespace internal
       static
       unsigned int
       n_active_fe_indices (const dealii::hp::DoFHandler<3,spacedim> &dof_handler,
-                           const unsigned int ,
+                           const unsigned int,
                            const unsigned int obj_index,
                            const dealii::internal::int2type<2> &)
       {
@@ -2302,8 +2302,8 @@ template <template <int, int> class DoFHandlerType, int spacedim, bool level_dof
 inline
 DoFAccessor<0,DoFHandlerType<1,spacedim>, level_dof_access>::
 DoFAccessor (const Triangulation<1,spacedim> *,
-             const int                 ,
-             const int                 ,
+             const int,
+             const int,
              const DoFHandlerType<1,spacedim> *)
   :
   dof_handler(nullptr)
diff --git a/include/deal.II/fe/fe_poly_face.templates.h b/include/deal.II/fe/fe_poly_face.templates.h
index 2d61668c8e..66bf808beb 100644
--- a/include/deal.II/fe/fe_poly_face.templates.h
+++ b/include/deal.II/fe/fe_poly_face.templates.h
@@ -75,7 +75,7 @@ template <class PolynomialType, int dim, int spacedim>
 void
 FE_PolyFace<PolynomialType,dim,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
-                const CellSimilarity::Similarity                                     ,
+                const CellSimilarity::Similarity,
                 const Quadrature<dim> &,
                 const Mapping<dim,spacedim> &,
                 const typename Mapping<dim,spacedim>::InternalDataBase &,
diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index bbda49e643..30416bdf31 100644
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -3450,7 +3450,7 @@ private:
    * Collection of manifold objects. We store only objects, which are not of
    * type FlatManifold.
    */
-  std::map<types::manifold_id, SmartPointer<const Manifold<dim,spacedim> , Triangulation<dim, spacedim> > >  manifold;
+  std::map<types::manifold_id, SmartPointer<const Manifold<dim,spacedim>, Triangulation<dim, spacedim> > >  manifold;
 
 
   /**
diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h
index 3b6df0e3d5..925e3ec2a1 100644
--- a/include/deal.II/grid/tria_accessor.templates.h
+++ b/include/deal.II/grid/tria_accessor.templates.h
@@ -395,8 +395,8 @@ TriaAccessorBase<structdim,dim,spacedim>::objects() const
 template <int structdim, int dim, int spacedim>
 InvalidAccessor<structdim, dim, spacedim>::
 InvalidAccessor (const Triangulation<dim,spacedim> *,
-                 const int                 ,
-                 const int                 ,
+                 const int,
+                 const int,
                  const AccessorData *)
 {
   Assert (false,
diff --git a/include/deal.II/lac/block_sparsity_pattern.h b/include/deal.II/lac/block_sparsity_pattern.h
index 9c06b15307..8c58d8c650 100644
--- a/include/deal.II/lac/block_sparsity_pattern.h
+++ b/include/deal.II/lac/block_sparsity_pattern.h
@@ -840,7 +840,7 @@ BlockSparsityPatternBase<SparsityPatternType>::add_entries (const size_type row,
     {
       const size_type col = *it;
 
-      const std::pair<size_type , size_type>
+      const std::pair<size_type, size_type>
       col_index = this->column_indices.global_to_local(col);
 
       const size_type local_index = counter_within_block[col_index.first]++;
@@ -862,7 +862,7 @@ BlockSparsityPatternBase<SparsityPatternType>::add_entries (const size_type row,
   // where we should start reading out
   // data. Now let's write the data into
   // the individual blocks!
-  const std::pair<size_type , size_type>
+  const std::pair<size_type, size_type>
   row_index = this->row_indices.global_to_local (row);
   for (size_type block_col=0; block_col<n_block_cols(); ++block_col)
     {
@@ -887,7 +887,7 @@ BlockSparsityPatternBase<SparsityPatternType>::exists (const size_type i,
   // if you get an error here, are
   // you sure you called
   // <tt>collect_sizes()</tt> before?
-  const std::pair<size_type , size_type>
+  const std::pair<size_type, size_type>
   row_index = row_indices.global_to_local (i),
   col_index = column_indices.global_to_local (j);
   return sub_objects[row_index.first][col_index.first]->exists (row_index.second,
@@ -902,7 +902,7 @@ unsigned int
 BlockSparsityPatternBase<SparsityPatternType>::
 row_length (const size_type row) const
 {
-  const std::pair<size_type , size_type>
+  const std::pair<size_type, size_type>
   row_index = row_indices.global_to_local (row);
 
   unsigned int c = 0;
@@ -940,7 +940,7 @@ BlockDynamicSparsityPattern::column_number (const size_type row,
                                             const unsigned int index) const
 {
   // .first= ith block, .second = jth row in that block
-  const std::pair<size_type ,size_type >
+  const std::pair<size_type,size_type >
   row_index = row_indices.global_to_local (row);
 
   Assert(index<row_length(row), ExcIndexRange(index, 0, row_length(row)));
diff --git a/include/deal.II/lac/diagonal_matrix.h b/include/deal.II/lac/diagonal_matrix.h
index 2e80b0b398..54966bb293 100644
--- a/include/deal.II/lac/diagonal_matrix.h
+++ b/include/deal.II/lac/diagonal_matrix.h
@@ -297,7 +297,7 @@ DiagonalMatrix<VectorType>::add (const size_type  row,
                                  const size_type  n_cols,
                                  const size_type *col_indices,
                                  const number2   *values,
-                                 const bool       ,
+                                 const bool,
                                  const bool       )
 {
   for (size_type i=0; i<n_cols; ++i)
diff --git a/include/deal.II/lac/la_vector.templates.h b/include/deal.II/lac/la_vector.templates.h
index f07f4e8237..974ad2d8c3 100644
--- a/include/deal.II/lac/la_vector.templates.h
+++ b/include/deal.II/lac/la_vector.templates.h
@@ -203,7 +203,7 @@ namespace LinearAlgebra
 
   template <typename Number>
   void Vector<Number>::import(const ReadWriteVector<Number> &,
-                              VectorOperation::values        ,
+                              VectorOperation::values,
                               std::shared_ptr<const CommunicationPatternBase>)
   {
     AssertThrow(false, ExcMessage("This function is not implemented."));
diff --git a/include/deal.II/lac/solver_gmres.h b/include/deal.II/lac/solver_gmres.h
index 0bfb2d8bd9..bd15eb78ee 100644
--- a/include/deal.II/lac/solver_gmres.h
+++ b/include/deal.II/lac/solver_gmres.h
@@ -412,7 +412,7 @@ protected:
    */
   static void
   compute_eigs_and_cond(
-    const FullMatrix<double> &H_orig ,
+    const FullMatrix<double> &H_orig,
     const unsigned int dim,
     const boost::signals2::signal<void (const std::vector<std::complex<double> > &)> &eigenvalues_signal,
     const boost::signals2::signal<void (const FullMatrix<double> &)> &hessenberg_signal,
diff --git a/include/deal.II/matrix_free/evaluation_kernels.h b/include/deal.II/matrix_free/evaluation_kernels.h
index 2dc040df16..13de640678 100644
--- a/include/deal.II/matrix_free/evaluation_kernels.h
+++ b/include/deal.II/matrix_free/evaluation_kernels.h
@@ -584,7 +584,7 @@ namespace internal
               VectorizedArray<Number> *gradients_quad[][dim],
               VectorizedArray<Number> *hessians_quad[][(dim*(dim+1))/2],
               VectorizedArray<Number> *,
-              const bool               ,
+              const bool,
               const bool               evaluate_gradients,
               const bool               evaluate_hessians)
   {
diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h
index 49395223d6..a95d6bb4ad 100644
--- a/include/deal.II/matrix_free/matrix_free.h
+++ b/include/deal.II/matrix_free/matrix_free.h
@@ -2145,7 +2145,7 @@ namespace internal
       {};
       tbb::task *execute ()
       {
-        tbb::empty_task *root = new( tbb::task::allocate_root() )
+        tbb::empty_task *root = new ( tbb::task::allocate_root() )
         tbb::empty_task;
         unsigned int evens = task_info.partition_evens[partition];
         unsigned int odds  = task_info.partition_odds[partition];
@@ -2158,14 +2158,14 @@ namespace internal
         root->set_ref_count(evens+1);
         for (unsigned int j=0; j<evens; j++)
           {
-            worker[j] = new(root->allocate_child())
+            worker[j] = new (root->allocate_child())
             CellWork<Worker>(function, task_info.
                              partition_color_blocks_row_index[partition]+2*j,
                              task_info, false);
             if (j>0)
               {
                 worker[j]->set_ref_count(2);
-                blocked_worker[j-1]->dummy = new(worker[j]->allocate_child())
+                blocked_worker[j-1]->dummy = new (worker[j]->allocate_child())
                 tbb::empty_task;
                 worker[j-1]->spawn(*blocked_worker[j-1]);
               }
@@ -2173,7 +2173,7 @@ namespace internal
               worker[j]->set_ref_count(1);
             if (j<evens-1)
               {
-                blocked_worker[j] = new(worker[j]->allocate_child())
+                blocked_worker[j] = new (worker[j]->allocate_child())
                 CellWork<Worker>(function, task_info.
                                  partition_color_blocks_row_index
                                  [partition] + 2*j+1, task_info, true);
@@ -2182,7 +2182,7 @@ namespace internal
               {
                 if (odds==evens)
                   {
-                    worker[evens] = new(worker[j]->allocate_child())
+                    worker[evens] = new (worker[j]->allocate_child())
                     CellWork<Worker>(function, task_info.
                                      partition_color_blocks_row_index[partition]+2*j+1,
                                      task_info, false);
@@ -2190,7 +2190,7 @@ namespace internal
                   }
                 else
                   {
-                    tbb::empty_task *child = new(worker[j]->allocate_child())
+                    tbb::empty_task *child = new (worker[j]->allocate_child())
                     tbb::empty_task();
                     worker[j]->spawn(*child);
                   }
@@ -2376,7 +2376,7 @@ MatrixFree<dim, Number>::cell_loop
 
       if (task_info.use_partition_partition == true)
         {
-          tbb::empty_task *root = new( tbb::task::allocate_root() )
+          tbb::empty_task *root = new ( tbb::task::allocate_root() )
           tbb::empty_task;
           unsigned int evens = task_info.evens;
           unsigned int odds  = task_info.odds;
@@ -2388,18 +2388,18 @@ MatrixFree<dim, Number>::cell_loop
           std::vector<internal::partition::PartitionWork<Worker>*>
           blocked_worker(n_blocked_workers);
           internal::MPIComCompress<OutVector> *worker_compr =
-            new(root->allocate_child())
+            new (root->allocate_child())
           internal::MPIComCompress<OutVector>(dst);
           worker_compr->set_ref_count(1);
           for (unsigned int j=0; j<evens; j++)
             {
               if (j>0)
                 {
-                  worker[j] = new(root->allocate_child())
+                  worker[j] = new (root->allocate_child())
                   internal::partition::PartitionWork<Worker>
                   (func,2*j,task_info,false);
                   worker[j]->set_ref_count(2);
-                  blocked_worker[j-1]->dummy = new(worker[j]->allocate_child())
+                  blocked_worker[j-1]->dummy = new (worker[j]->allocate_child())
                   tbb::empty_task;
                   if (j>1)
                     worker[j-1]->spawn(*blocked_worker[j-1]);
@@ -2408,7 +2408,7 @@ MatrixFree<dim, Number>::cell_loop
                 }
               else
                 {
-                  worker[j] = new(worker_compr->allocate_child())
+                  worker[j] = new (worker_compr->allocate_child())
                   internal::partition::PartitionWork<Worker>
                   (func,2*j,task_info,false);
                   worker[j]->set_ref_count(2);
@@ -2419,7 +2419,7 @@ MatrixFree<dim, Number>::cell_loop
                 }
               if (j<evens-1)
                 {
-                  blocked_worker[j] = new(worker[j]->allocate_child())
+                  blocked_worker[j] = new (worker[j]->allocate_child())
                   internal::partition::PartitionWork<Worker>
                   (func,2*j+1,task_info,true);
                 }
@@ -2427,14 +2427,14 @@ MatrixFree<dim, Number>::cell_loop
                 {
                   if (odds==evens)
                     {
-                      worker[evens] = new(worker[j]->allocate_child())
+                      worker[evens] = new (worker[j]->allocate_child())
                       internal::partition::PartitionWork<Worker>
                       (func,2*j+1,task_info,false);
                       worker[j]->spawn(*worker[evens]);
                     }
                   else
                     {
-                      tbb::empty_task *child = new(worker[j]->allocate_child())
+                      tbb::empty_task *child = new (worker[j]->allocate_child())
                       tbb::empty_task();
                       worker[j]->spawn(*child);
                     }
@@ -2453,7 +2453,7 @@ MatrixFree<dim, Number>::cell_loop
           // tree of partitions
           if (odds > 0)
             {
-              tbb::empty_task *root = new( tbb::task::allocate_root() ) tbb::empty_task;
+              tbb::empty_task *root = new ( tbb::task::allocate_root() ) tbb::empty_task;
               root->set_ref_count(evens+1);
               unsigned int n_blocked_workers = odds-(odds+evens+1)%2;
               unsigned int n_workers = task_info.partition_color_blocks_data.size()-1-
@@ -2463,7 +2463,7 @@ MatrixFree<dim, Number>::cell_loop
               unsigned int worker_index = 0, slice_index = 0;
               unsigned int spawn_index =  0;
               int spawn_index_child = -2;
-              internal::MPIComCompress<OutVector> *worker_compr = new(root->allocate_child())
+              internal::MPIComCompress<OutVector> *worker_compr = new (root->allocate_child())
               internal::MPIComCompress<OutVector>(dst);
               worker_compr->set_ref_count(1);
               for (unsigned int part=0;
@@ -2471,10 +2471,10 @@ MatrixFree<dim, Number>::cell_loop
                 {
                   const unsigned int spawn_index_new = worker_index;
                   if (part == 0)
-                    worker[worker_index] = new(worker_compr->allocate_child())
+                    worker[worker_index] = new (worker_compr->allocate_child())
                     internal::color::PartitionWork<Worker>(func,slice_index,task_info,false);
                   else
-                    worker[worker_index] = new(root->allocate_child())
+                    worker[worker_index] = new (root->allocate_child())
                     internal::color::PartitionWork<Worker>(func,slice_index,task_info,false);
                   slice_index++;
                   for (; slice_index<task_info.partition_color_blocks_row_index[part+1];
@@ -2513,14 +2513,14 @@ MatrixFree<dim, Number>::cell_loop
                     {
                       if (part<task_info.partition_color_blocks_row_index.size()-2)
                         {
-                          blocked_worker[part/2] = new(worker[worker_index-1]->allocate_child())
+                          blocked_worker[part/2] = new (worker[worker_index-1]->allocate_child())
                           internal::color::PartitionWork<Worker>(func,slice_index,task_info,true);
                           slice_index++;
                           if (slice_index<
                               task_info.partition_color_blocks_row_index[part+1])
                             {
                               blocked_worker[part/2]->set_ref_count(1);
-                              worker[worker_index] = new(blocked_worker[part/2]->allocate_child())
+                              worker[worker_index] = new (blocked_worker[part/2]->allocate_child())
                               internal::color::PartitionWork<Worker>(func,slice_index,task_info,false);
                               slice_index++;
                             }
diff --git a/include/deal.II/meshworker/assembler.h b/include/deal.II/meshworker/assembler.h
index bfaf7994a6..d3501c627f 100644
--- a/include/deal.II/meshworker/assembler.h
+++ b/include/deal.II/meshworker/assembler.h
@@ -601,7 +601,7 @@ namespace MeshWorker
 
 
 
-    template <typename MatrixType ,typename number>
+    template <typename MatrixType,typename number>
     template <class DOFINFO>
     inline void
     MatrixLocalBlocksToGlobalBlocks<MatrixType, number>::initialize_info
@@ -730,7 +730,7 @@ namespace MeshWorker
     }
 
 
-    template <typename MatrixType ,typename number>
+    template <typename MatrixType,typename number>
     template <class DOFINFO>
     inline void
     MGMatrixLocalBlocksToGlobalBlocks<MatrixType, number>::initialize_info
diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h
index e69cb509b8..e856826168 100644
--- a/include/deal.II/numerics/vector_tools.templates.h
+++ b/include/deal.II/numerics/vector_tools.templates.h
@@ -2732,8 +2732,8 @@ namespace VectorTools
     bool real_part_bigger_than(const std::complex<number1> a,
                                const std::complex<number2> &b)
     {
-      Assert(std::abs(a.imag()) <= 1e-15*std::abs(a) , ExcInternalError());
-      Assert(std::abs(b.imag()) <= 1e-15*std::abs(b) , ExcInternalError());
+      Assert(std::abs(a.imag()) <= 1e-15*std::abs(a), ExcInternalError());
+      Assert(std::abs(b.imag()) <= 1e-15*std::abs(b), ExcInternalError());
       return a.real() > b.real();
     }
 
@@ -5717,7 +5717,7 @@ namespace VectorTools
                   fe_values.reinit (cell, face + cell->active_fe_index ()
                                     * GeometryInfo<dim>::faces_per_cell);
 
-                  const std::vector<DerivativeForm<1,dim ,spacedim> > &
+                  const std::vector<DerivativeForm<1,dim,spacedim> > &
                   jacobians = fe_values.get_present_fe_values ().get_jacobians ();
 
                   fe_face_values.reinit (cell, face);
diff --git a/include/deal.II/physics/transformations.h b/include/deal.II/physics/transformations.h
index 90a060b1a5..93ab0ab6e8 100644
--- a/include/deal.II/physics/transformations.h
+++ b/include/deal.II/physics/transformations.h
@@ -914,10 +914,10 @@ Physics::Transformations::Rotations::rotation_matrix_2d (const Number &angle)
 {
   const double rotation[2][2]
   = {{
-      std::cos(angle) , -std::sin(angle)
+      std::cos(angle), -std::sin(angle)
     },
     {
-      std::sin(angle) , std::cos(angle)
+      std::sin(angle), std::cos(angle)
     }
   };
   return Tensor<2,2> (rotation);
diff --git a/source/base/tensor_product_polynomials.cc b/source/base/tensor_product_polynomials.cc
index 00ff6cac42..424a72c7b9 100644
--- a/source/base/tensor_product_polynomials.cc
+++ b/source/base/tensor_product_polynomials.cc
@@ -43,8 +43,8 @@ namespace internal
 
     inline
     void compute_tensor_index(const unsigned int n,
-                              const unsigned int ,
-                              const unsigned int ,
+                              const unsigned int,
+                              const unsigned int,
                               unsigned int       (&indices)[1])
     {
       indices[0] = n;
@@ -53,7 +53,7 @@ namespace internal
     inline
     void compute_tensor_index(const unsigned int n,
                               const unsigned int n_pols_0,
-                              const unsigned int ,
+                              const unsigned int,
                               unsigned int       (&indices)[2])
     {
       indices[0] = n % n_pols_0;
diff --git a/source/base/tensor_product_polynomials_bubbles.cc b/source/base/tensor_product_polynomials_bubbles.cc
index bb7c693e9b..4da5743c44 100644
--- a/source/base/tensor_product_polynomials_bubbles.cc
+++ b/source/base/tensor_product_polynomials_bubbles.cc
@@ -56,7 +56,7 @@ TensorProductPolynomialsBubbles<dim>::compute_value (const unsigned int i,
 
 template <>
 double
-TensorProductPolynomialsBubbles<0>::compute_value (const unsigned int ,
+TensorProductPolynomialsBubbles<0>::compute_value (const unsigned int,
                                                    const Point<0> &) const
 {
   Assert (false, ExcNotImplemented());
diff --git a/source/base/tensor_product_polynomials_const.cc b/source/base/tensor_product_polynomials_const.cc
index 401a30e621..57e9b22733 100644
--- a/source/base/tensor_product_polynomials_const.cc
+++ b/source/base/tensor_product_polynomials_const.cc
@@ -45,7 +45,7 @@ TensorProductPolynomialsConst<dim>::compute_value (const unsigned int i,
 
 template <>
 double
-TensorProductPolynomialsConst<0>::compute_value (const unsigned int ,
+TensorProductPolynomialsConst<0>::compute_value (const unsigned int,
                                                  const Point<0> &) const
 {
   Assert (false, ExcNotImplemented());
diff --git a/source/dofs/dof_tools_constraints.inst.in b/source/dofs/dof_tools_constraints.inst.in
index d021d2f246..1fda53d017 100644
--- a/source/dofs/dof_tools_constraints.inst.in
+++ b/source/dofs/dof_tools_constraints.inst.in
@@ -85,7 +85,7 @@ for (deal_II_dimension : DIMENSIONS)
     void
     DoFTools::make_zero_boundary_constraints
     (const DoFHandler<deal_II_dimension> &,
-     const types::boundary_id          ,
+     const types::boundary_id,
      ConstraintMatrix                    &,
      const ComponentMask             &);
 
@@ -100,7 +100,7 @@ for (deal_II_dimension : DIMENSIONS)
     void
     DoFTools::make_zero_boundary_constraints
     (const hp::DoFHandler<deal_II_dimension> &,
-     const types::boundary_id          ,
+     const types::boundary_id,
      ConstraintMatrix                        &,
      const ComponentMask                 &);
 
diff --git a/source/fe/fe.cc b/source/fe/fe.cc
index dbcd3c97ff..aecf5e86c7 100644
--- a/source/fe/fe.cc
+++ b/source/fe/fe.cc
@@ -64,7 +64,7 @@ FiniteElement (const FiniteElementData<dim> &fe_data,
   :
   FiniteElementData<dim> (fe_data),
   adjust_quad_dof_index_for_face_orientation_table (dim == 3 ?
-                                                    this->dofs_per_quad : 0 ,
+                                                    this->dofs_per_quad : 0,
                                                     dim==3 ? 8 : 0),
   adjust_line_dof_index_for_line_orientation_table (dim == 3 ?
                                                     this->dofs_per_line : 0),
diff --git a/source/fe/fe_dgp.cc b/source/fe/fe_dgp.cc
index 657e93511a..88a9d7cdcb 100644
--- a/source/fe/fe_dgp.cc
+++ b/source/fe/fe_dgp.cc
@@ -125,7 +125,7 @@ template <int dim, int spacedim>
 void
 FE_DGP<dim,spacedim>::
 get_subface_interpolation_matrix (const FiniteElement<dim,spacedim> &x_source_fe,
-                                  const unsigned int ,
+                                  const unsigned int,
                                   FullMatrix<double>           &interpolation_matrix) const
 {
   // this is only implemented, if the source FE is also a DGP element. in that
diff --git a/source/fe/fe_dgp_monomial.cc b/source/fe/fe_dgp_monomial.cc
index 2cbdf9d49d..ae68157ef7 100644
--- a/source/fe/fe_dgp_monomial.cc
+++ b/source/fe/fe_dgp_monomial.cc
@@ -278,7 +278,7 @@ template <int dim>
 void
 FE_DGPMonomial<dim>::
 get_subface_interpolation_matrix (const FiniteElement<dim> &x_source_fe,
-                                  const unsigned int ,
+                                  const unsigned int,
                                   FullMatrix<double>           &interpolation_matrix) const
 {
   // this is only implemented, if the source
diff --git a/source/fe/fe_dgp_nonparametric.cc b/source/fe/fe_dgp_nonparametric.cc
index 6caa4839cd..c01895fdcb 100644
--- a/source/fe/fe_dgp_nonparametric.cc
+++ b/source/fe/fe_dgp_nonparametric.cc
@@ -281,7 +281,7 @@ template <int dim, int spacedim>
 void
 FE_DGPNonparametric<dim,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
-                const CellSimilarity::Similarity                                     ,
+                const CellSimilarity::Similarity,
                 const Quadrature<dim> &,
                 const Mapping<dim,spacedim> &,
                 const typename Mapping<dim,spacedim>::InternalDataBase &,
@@ -327,7 +327,7 @@ template <int dim, int spacedim>
 void
 FE_DGPNonparametric<dim,spacedim>::
 fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
-                     const unsigned int                                                   ,
+                     const unsigned int,
                      const Quadrature<dim-1>                                             &,
                      const Mapping<dim,spacedim> &,
                      const typename Mapping<dim,spacedim>::InternalDataBase &,
@@ -373,8 +373,8 @@ template <int dim, int spacedim>
 void
 FE_DGPNonparametric<dim,spacedim>::
 fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
-                        const unsigned int                                                   ,
-                        const unsigned int                                                   ,
+                        const unsigned int,
+                        const unsigned int,
                         const Quadrature<dim-1>                                             &,
                         const Mapping<dim,spacedim> &,
                         const typename Mapping<dim,spacedim>::InternalDataBase &,
@@ -450,7 +450,7 @@ template <int dim, int spacedim>
 void
 FE_DGPNonparametric<dim,spacedim>::
 get_subface_interpolation_matrix (const FiniteElement<dim,spacedim> &x_source_fe,
-                                  const unsigned int ,
+                                  const unsigned int,
                                   FullMatrix<double>           &interpolation_matrix) const
 {
   // this is only implemented, if the source
diff --git a/source/fe/fe_dgq.cc b/source/fe/fe_dgq.cc
index 495cc48a92..1ec21f326e 100644
--- a/source/fe/fe_dgq.cc
+++ b/source/fe/fe_dgq.cc
@@ -343,7 +343,7 @@ template <int dim, int spacedim>
 void
 FE_DGQ<dim, spacedim>::
 get_subface_interpolation_matrix (const FiniteElement<dim, spacedim> &x_source_fe,
-                                  const unsigned int ,
+                                  const unsigned int,
                                   FullMatrix<double>           &interpolation_matrix) const
 {
   // this is only implemented, if the source
diff --git a/source/fe/fe_face.cc b/source/fe/fe_face.cc
index 8dde09d0c4..5b56cec888 100644
--- a/source/fe/fe_face.cc
+++ b/source/fe/fe_face.cc
@@ -460,7 +460,7 @@ template <int spacedim>
 void
 FE_FaceQ<1,spacedim>::
 fill_fe_values(const typename Triangulation<1,spacedim>::cell_iterator &,
-               const CellSimilarity::Similarity                                   ,
+               const CellSimilarity::Similarity,
                const Quadrature<1> &,
                const Mapping<1,spacedim> &,
                const typename Mapping<1,spacedim>::InternalDataBase &,
@@ -499,8 +499,8 @@ template <int spacedim>
 void
 FE_FaceQ<1,spacedim>::
 fill_fe_subface_values (const typename Triangulation<1,spacedim>::cell_iterator &,
-                        const unsigned int                                                 ,
-                        const unsigned int                                                 ,
+                        const unsigned int,
+                        const unsigned int,
                         const Quadrature<0> &,
                         const Mapping<1,spacedim> &,
                         const typename Mapping<1,spacedim>::InternalDataBase &,
@@ -687,7 +687,7 @@ get_subface_interpolation_matrix (const FiniteElement<dim,spacedim> &x_source_fe
                                                             subface);
 
           for (unsigned int j = 0; j < source_fe->dofs_per_face; ++j)
-            mass (k , j) = source_fe->poly_space.compute_value(j, p);
+            mass (k, j) = source_fe->poly_space.compute_value(j, p);
         }
 
       Householder<double> H(mass);
diff --git a/source/fe/fe_nothing.cc b/source/fe/fe_nothing.cc
index 7095354607..3e7bc002eb 100644
--- a/source/fe/fe_nothing.cc
+++ b/source/fe/fe_nothing.cc
@@ -112,7 +112,7 @@ template <int dim, int spacedim>
 void
 FE_Nothing<dim,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
-                const CellSimilarity::Similarity                                     ,
+                const CellSimilarity::Similarity,
                 const Quadrature<dim> &,
                 const Mapping<dim,spacedim> &,
                 const typename Mapping<dim,spacedim>::InternalDataBase &,
@@ -129,7 +129,7 @@ template <int dim, int spacedim>
 void
 FE_Nothing<dim,spacedim>::
 fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
-                     const unsigned int                                                   ,
+                     const unsigned int,
                      const Quadrature<dim-1>                                             &,
                      const Mapping<dim,spacedim> &,
                      const typename Mapping<dim,spacedim>::InternalDataBase &,
@@ -146,8 +146,8 @@ template <int dim, int spacedim>
 void
 FE_Nothing<dim,spacedim>::
 fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
-                        const unsigned int                                                   ,
-                        const unsigned int                                                   ,
+                        const unsigned int,
+                        const unsigned int,
                         const Quadrature<dim-1>                                             &,
                         const Mapping<dim,spacedim> &,
                         const typename Mapping<dim,spacedim>::InternalDataBase &,
diff --git a/source/fe/fe_p1nc.cc b/source/fe/fe_p1nc.cc
index b2e10eab29..30cb860fad 100644
--- a/source/fe/fe_p1nc.cc
+++ b/source/fe/fe_p1nc.cc
@@ -194,7 +194,7 @@ FE_P1NC::get_subface_data (const UpdateFlags update_flags,
 
 void
 FE_P1NC::fill_fe_values (const Triangulation<2,2>::cell_iterator           &cell,
-                         const CellSimilarity::Similarity                   ,
+                         const CellSimilarity::Similarity,
                          const Quadrature<2> &,
                          const Mapping<2,2> &,
                          const Mapping<2,2>::InternalDataBase &,
diff --git a/source/fe/fe_poly_tensor.cc b/source/fe/fe_poly_tensor.cc
index c7bcc7c7bf..a88e6155d7 100644
--- a/source/fe/fe_poly_tensor.cc
+++ b/source/fe/fe_poly_tensor.cc
@@ -41,7 +41,7 @@ namespace
    */
   void
   get_face_sign_change_rt (const Triangulation<1>::cell_iterator &,
-                           const unsigned int                     ,
+                           const unsigned int,
                            std::vector<double>                   &face_sign)
   {
     // nothing to do in 1d
diff --git a/source/fe/fe_q_base.cc b/source/fe/fe_q_base.cc
index 43453859bd..9dc8ed6976 100644
--- a/source/fe/fe_q_base.cc
+++ b/source/fe/fe_q_base.cc
@@ -440,7 +440,7 @@ FE_Q_Base<PolynomialType,dim,spacedim>::initialize (const std::vector<Point<1> >
   const unsigned int q_dofs_per_cell = Utilities::fixed_power<dim>(q_degree+1);
   Assert(q_dofs_per_cell == this->dofs_per_cell ||
          q_dofs_per_cell+1 == this->dofs_per_cell ||
-         q_dofs_per_cell+dim == this->dofs_per_cell , ExcInternalError());
+         q_dofs_per_cell+dim == this->dofs_per_cell, ExcInternalError());
 
   {
     std::vector<unsigned int> renumber(q_dofs_per_cell);
diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc
index 04d6bba629..01f711eb6b 100644
--- a/source/fe/fe_system.cc
+++ b/source/fe/fe_system.cc
@@ -203,7 +203,7 @@ FESystem<dim,spacedim>::FESystem (const FiniteElement<dim,spacedim> &fe1,
                                FETools::Compositing::compute_nonzero_components(&fe1, n1,
                                    &fe2, n2,
                                    &fe3, n3,
-                                   &fe4 ,n4)),
+                                   &fe4, n4)),
   base_elements((n1>0)+(n2>0)+(n3>0)+(n4>0))
 {
   std::vector<const FiniteElement<dim,spacedim>*> fes;
@@ -245,7 +245,7 @@ FESystem<dim,spacedim>::FESystem (const FiniteElement<dim,spacedim> &fe1,
                                FETools::Compositing::compute_nonzero_components(&fe1, n1,
                                    &fe2, n2,
                                    &fe3, n3,
-                                   &fe4 ,n4,
+                                   &fe4, n4,
                                    &fe5, n5)),
   base_elements((n1>0)+(n2>0)+(n3>0)+(n4>0)+(n5>0))
 {
diff --git a/source/fe/fe_tools.inst.in b/source/fe/fe_tools.inst.in
index a87028c66f..53815d8f45 100644
--- a/source/fe/fe_tools.inst.in
+++ b/source/fe/fe_tools.inst.in
@@ -97,7 +97,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
 
     template
     void compute_block_renumbering (
-        const FiniteElement<deal_II_dimension,deal_II_space_dimension> & ,
+        const FiniteElement<deal_II_dimension,deal_II_space_dimension> &,
         std::vector<types::global_dof_index> &, std::vector<types::global_dof_index> &, bool);
 
     template
@@ -148,7 +148,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
 
     template
     void compute_component_wise(
-        const FiniteElement<deal_II_dimension> & ,
+        const FiniteElement<deal_II_dimension> &,
         std::vector<unsigned int> &, std::vector<std::vector<unsigned int> > &);
 
     template
@@ -222,7 +222,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
     compute_projection_from_face_quadrature_points_matrix (const FiniteElement<deal_II_dimension> &,
             const Quadrature<deal_II_dimension-1>    &,
             const Quadrature<deal_II_dimension-1>    &,
-            const DoFHandler<deal_II_dimension>::active_cell_iterator & ,
+            const DoFHandler<deal_II_dimension>::active_cell_iterator &,
             unsigned int,
             FullMatrix<double> &);
 #endif
diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc
index 845c1a0387..1a590ca50b 100644
--- a/source/fe/fe_values.cc
+++ b/source/fe/fe_values.cc
@@ -3674,7 +3674,7 @@ namespace
         static_cast<const Type *>(present_cell.get())->~Type();
 
         // then construct a new object in-place
-        new(const_cast<void *>(static_cast<const void *>(present_cell.get()))) Type(new_cell);
+        new (const_cast<void *>(static_cast<const void *>(present_cell.get()))) Type(new_cell);
       }
     else
       // if the types don't match, there is nothing we can do here
diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc
index 0f8ddfbb14..57af759726 100644
--- a/source/fe/mapping_fe_field.cc
+++ b/source/fe/mapping_fe_field.cc
@@ -1660,7 +1660,7 @@ transform (const ArrayView<const Tensor<1,dim> >                  &input,
 template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
-transform (const ArrayView<const DerivativeForm<1, dim ,spacedim> > &input,
+transform (const ArrayView<const DerivativeForm<1, dim, spacedim> > &input,
            const MappingType                                         mapping_type,
            const typename Mapping<dim,spacedim>::InternalDataBase   &mapping_data,
            const ArrayView<Tensor<2,spacedim> >                     &output) const
@@ -1676,7 +1676,7 @@ template<int dim, int spacedim, typename VectorType, typename DoFHandlerType>
 void
 MappingFEField<dim,spacedim,VectorType,DoFHandlerType>::
 transform (const ArrayView<const Tensor<2, dim> >                 &input,
-           const MappingType                                       ,
+           const MappingType,
            const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
            const ArrayView<Tensor<2,spacedim> >                   &output) const
 {
diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc
index a3d0b17dea..dadfad5fe8 100644
--- a/source/fe/mapping_q.cc
+++ b/source/fe/mapping_q.cc
@@ -373,7 +373,7 @@ transform (const ArrayView<const Tensor<1,dim> >                  &input,
 template<int dim, int spacedim>
 void
 MappingQ<dim,spacedim>::
-transform (const ArrayView<const DerivativeForm<1, dim ,spacedim> >  &input,
+transform (const ArrayView<const DerivativeForm<1, dim, spacedim> >  &input,
            const MappingType                                          mapping_type,
            const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_data,
            const ArrayView<Tensor<2,spacedim> >                      &output) const
@@ -421,7 +421,7 @@ transform (const ArrayView<const Tensor<2, dim> >                 &input,
 template<int dim, int spacedim>
 void
 MappingQ<dim,spacedim>::
-transform (const ArrayView<const DerivativeForm<2, dim ,spacedim> >  &input,
+transform (const ArrayView<const DerivativeForm<2, dim,spacedim> >  &input,
            const MappingType                                          mapping_type,
            const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_data,
            const ArrayView<Tensor<3,spacedim> >                      &output) const
diff --git a/source/fe/mapping_q1_eulerian.cc b/source/fe/mapping_q1_eulerian.cc
index 45bd6fa291..9360e8ae50 100644
--- a/source/fe/mapping_q1_eulerian.cc
+++ b/source/fe/mapping_q1_eulerian.cc
@@ -128,7 +128,7 @@ template<int dim, class VectorType, int spacedim>
 CellSimilarity::Similarity
 MappingQ1Eulerian<dim,VectorType,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                const CellSimilarity::Similarity                           ,
+                const CellSimilarity::Similarity,
                 const Quadrature<dim>                                     &quadrature,
                 const typename Mapping<dim,spacedim>::InternalDataBase    &internal_data,
                 internal::FEValues::MappingRelatedData<dim,spacedim>      &output_data) const
diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc
index 949d169292..bd9f65ffc2 100644
--- a/source/fe/mapping_q_eulerian.cc
+++ b/source/fe/mapping_q_eulerian.cc
@@ -222,7 +222,7 @@ template<int dim, class VectorType, int spacedim>
 CellSimilarity::Similarity
 MappingQEulerian<dim,VectorType,spacedim>::
 fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                const CellSimilarity::Similarity                           ,
+                const CellSimilarity::Similarity,
                 const Quadrature<dim>                                     &quadrature,
                 const typename Mapping<dim,spacedim>::InternalDataBase    &internal_data,
                 internal::FEValues::MappingRelatedData<dim,spacedim>      &output_data) const
diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc
index 61ca76837f..2f148fa098 100644
--- a/source/grid/grid_generator.cc
+++ b/source/grid/grid_generator.cc
@@ -2018,7 +2018,7 @@ namespace GridGenerator
                     const Point<1> &,
                     const double,
                     const double,
-                    const unsigned int ,
+                    const unsigned int,
                     const bool)
   {
     Assert (false, ExcNotImplemented());
@@ -2030,7 +2030,7 @@ namespace GridGenerator
                        const double,
                        const double,
                        const double,
-                       const unsigned int ,
+                       const unsigned int,
                        const unsigned int )
   {
     Assert (false, ExcNotImplemented());
@@ -2063,7 +2063,7 @@ namespace GridGenerator
                     const Point<1> &,
                     const double,
                     const double,
-                    const unsigned int ,
+                    const unsigned int,
                     const bool)
   {
     Assert (false, ExcNotImplemented());
@@ -2074,7 +2074,7 @@ namespace GridGenerator
                             const Point<1> &,
                             const double,
                             const double,
-                            const unsigned int ,
+                            const unsigned int,
                             const bool)
   {
     Assert (false, ExcNotImplemented());
@@ -2728,26 +2728,26 @@ namespace GridGenerator
 
     const Point<3> vertices[20] =
     {
-      Point<3>(left, left , -len/2.),
-      Point<3>(rl2,  left , -len/2.),
-      Point<3>(rl2,  rl2  , -len/2.),
-      Point<3>(left, rl2  , -len/2.),
-      Point<3>(right,left , -len/2.),
-      Point<3>(right,rl2  , -len/2.),
+      Point<3>(left, left, -len/2.),
+      Point<3>(rl2,  left, -len/2.),
+      Point<3>(rl2,  rl2, -len/2.),
+      Point<3>(left, rl2, -len/2.),
+      Point<3>(right,left, -len/2.),
+      Point<3>(right,rl2, -len/2.),
       Point<3>(rl2,  right, -len/2.),
       Point<3>(left, right, -len/2.),
       Point<3>(right,right, -len/2.),
-      Point<3>(rl2,  left , -len/2.),
-      Point<3>(left, left , len/2.),
-      Point<3>(rl2,  left , len/2.),
-      Point<3>(rl2,  rl2  , len/2.),
-      Point<3>(left, rl2  , len/2.),
-      Point<3>(right,left , len/2.),
-      Point<3>(right,rl2  , len/2.),
+      Point<3>(rl2,  left, -len/2.),
+      Point<3>(left, left, len/2.),
+      Point<3>(rl2,  left, len/2.),
+      Point<3>(rl2,  rl2, len/2.),
+      Point<3>(left, rl2, len/2.),
+      Point<3>(right,left, len/2.),
+      Point<3>(right,rl2, len/2.),
       Point<3>(rl2,  right, len/2.),
       Point<3>(left, right, len/2.),
       Point<3>(right,right, len/2.),
-      Point<3>(rl2,  left , len/2.)
+      Point<3>(rl2,  left, len/2.)
     };
     const int cell_vertices[4][8] = { { 0,1,3,2, 10, 11, 13, 12 },
       { 9,4,2,5, 19,14, 12, 15 },
@@ -2806,9 +2806,9 @@ namespace GridGenerator
       21,20,22,
       17,16,18,
       25,24,26,
-      5 , 4, 6,
-      1 , 0, 2,
-      9 , 8,10,
+      5, 4, 6,
+      1, 0, 2,
+      9, 8,10,
       37,36,38,
       33,32,34,
       41,40,42
@@ -3746,16 +3746,16 @@ namespace GridGenerator
         vertices.push_back (center+Point<3>( a,  a, 0));                  //1
         vertices.push_back (center+Point<3>( b,  b, 0));                  //2
         vertices.push_back (center+Point<3>( 0, outer_radius, 0));        //3
-        vertices.push_back (center+Point<3>( 0, a , a));                  //4
-        vertices.push_back (center+Point<3>( c, c , h));                  //5
-        vertices.push_back (center+Point<3>( d, d , e));                  //6
-        vertices.push_back (center+Point<3>( 0, b , b));                  //7
-        vertices.push_back (center+Point<3>( inner_radius, 0 , 0));       //8
-        vertices.push_back (center+Point<3>( outer_radius, 0 , 0));       //9
-        vertices.push_back (center+Point<3>( a, 0 , a));  //10
-        vertices.push_back (center+Point<3>( b, 0 , b));  //11
-        vertices.push_back (center+Point<3>( 0, 0 , inner_radius));       //12
-        vertices.push_back (center+Point<3>( 0, 0 , outer_radius));       //13
+        vertices.push_back (center+Point<3>( 0, a, a));                   //4
+        vertices.push_back (center+Point<3>( c, c, h));                   //5
+        vertices.push_back (center+Point<3>( d, d, e));                   //6
+        vertices.push_back (center+Point<3>( 0, b, b));                   //7
+        vertices.push_back (center+Point<3>( inner_radius, 0, 0));        //8
+        vertices.push_back (center+Point<3>( outer_radius, 0, 0));        //9
+        vertices.push_back (center+Point<3>( a, 0, a));   //10
+        vertices.push_back (center+Point<3>( b, 0, b));   //11
+        vertices.push_back (center+Point<3>( 0, 0, inner_radius));        //12
+        vertices.push_back (center+Point<3>( 0, 0, outer_radius));        //13
 
         const int cell_vertices[3][8] =
         {
@@ -4649,13 +4649,13 @@ namespace GridGenerator
 {
 
   template void
-  hyper_sphere< 1 ,  2 > (Triangulation< 1 ,   2> &,
-                          const Point<2>   &center,
-                          const double        radius);
+  hyper_sphere< 1,  2 > (Triangulation< 1,   2> &,
+                         const Point<2>   &center,
+                         const double        radius);
   template void
-  hyper_sphere< 2 ,  3 > (Triangulation< 2 ,   3> &,
-                          const Point<3>   &center,
-                          const double        radius);
+  hyper_sphere< 2,  3 > (Triangulation< 2,   3> &,
+                         const Point<3>   &center,
+                         const double        radius);
 }
 #include "grid_generator.inst"
 
diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 1a1b174988..46d4a95b1c 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -3975,9 +3975,9 @@ next_cell:
       // property somewhat sloppy as "face_flip"
       // (always: face_orientation = true, face_rotation = false)
 
-      static const MATCH_T m_tff = {{ 0 , 1 }};
+      static const MATCH_T m_tff = {{ 0, 1 }};
       if (matching == m_tff) return 1;           // [true ,false,false]
-      static const MATCH_T m_ttf = {{ 1 , 0 }};
+      static const MATCH_T m_ttf = {{ 1, 0 }};
       if (matching == m_ttf) return 3;           // [true ,true ,false]
       Assert(false, ExcInternalError());
       // what follows is dead code, but it avoids warnings about the lack
@@ -3996,21 +3996,21 @@ next_cell:
       // as well as the actual implementation in source/grid/tria.cc
       // for more details...
 
-      static const MATCH_T m_tff = {{ 0 , 1 , 2 , 3 }};
+      static const MATCH_T m_tff = {{ 0, 1, 2, 3 }};
       if (matching == m_tff) return 1;                   // [true ,false,false]
-      static const MATCH_T m_tft = {{ 1 , 3 , 0 , 2 }};
+      static const MATCH_T m_tft = {{ 1, 3, 0, 2 }};
       if (matching == m_tft) return 5;                   // [true ,false,true ]
-      static const MATCH_T m_ttf = {{ 3 , 2 , 1 , 0 }};
+      static const MATCH_T m_ttf = {{ 3, 2, 1, 0 }};
       if (matching == m_ttf) return 3;                   // [true ,true ,false]
-      static const MATCH_T m_ttt = {{ 2 , 0 , 3 , 1 }};
+      static const MATCH_T m_ttt = {{ 2, 0, 3, 1 }};
       if (matching == m_ttt) return 7;                   // [true ,true ,true ]
-      static const MATCH_T m_fff = {{ 0 , 2 , 1 , 3 }};
+      static const MATCH_T m_fff = {{ 0, 2, 1, 3 }};
       if (matching == m_fff) return 0;                   // [false,false,false]
-      static const MATCH_T m_fft = {{ 2 , 3 , 0 , 1 }};
+      static const MATCH_T m_fft = {{ 2, 3, 0, 1 }};
       if (matching == m_fft) return 4;                   // [false,false,true ]
-      static const MATCH_T m_ftf = {{ 3 , 1 , 2 , 0 }};
+      static const MATCH_T m_ftf = {{ 3, 1, 2, 0 }};
       if (matching == m_ftf) return 2;                   // [false,true ,false]
-      static const MATCH_T m_ftt = {{ 1 , 0 , 3 , 2 }};
+      static const MATCH_T m_ftt = {{ 1, 0, 3, 2 }};
       if (matching == m_ftt) return 6;                   // [false,true ,true ]
       Assert(false, ExcInternalError());
       // what follows is dead code, but it avoids warnings about the lack
diff --git a/source/grid/grid_tools.inst.in b/source/grid/grid_tools.inst.in
index f148328ef1..5f97b7adb1 100644
--- a/source/grid/grid_tools.inst.in
+++ b/source/grid/grid_tools.inst.in
@@ -163,7 +163,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS
     template
     void
     rotate<deal_II_dimension> (const double,
-                               const unsigned int ,
+                               const unsigned int,
                                Triangulation<deal_II_dimension, deal_II_space_dimension> &);
 #endif
 
diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index 24f9ac015a..29c2960054 100644
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -9325,7 +9325,7 @@ copy_triangulation (const Triangulation<dim, spacedim> &other_tria)
     faces.reset (new internal::Triangulation::TriaFaces<dim>(*other_tria.faces));
 
   typename std::map<types::manifold_id,
-           SmartPointer<const Manifold<dim,spacedim> , Triangulation<dim, spacedim> > >::const_iterator
+           SmartPointer<const Manifold<dim,spacedim>, Triangulation<dim, spacedim> > >::const_iterator
            bdry_iterator = other_tria.manifold.begin();
   for (; bdry_iterator != other_tria.manifold.end() ; ++bdry_iterator)
     manifold[bdry_iterator->first] = bdry_iterator->second;
@@ -9474,10 +9474,10 @@ create_triangulation (const std::vector<Point<spacedim> >    &v,
         }
         case 2:
         {
-          bool values [][4]= {{false,true ,true , false},
-            {true ,false,false, true },
-            {true ,false,false, true },
-            {false,true ,true , false}
+          bool values [][4]= {{false,true,true, false},
+            {true,false,false, true },
+            {true,false,false, true },
+            {false,true,true, false}
           };
           for (unsigned int i=0; i< GeometryInfo< dim >::faces_per_cell; ++i)
             for (unsigned int j=0; j< GeometryInfo< dim >::faces_per_cell; ++j)
diff --git a/source/lac/constraint_matrix.cc b/source/lac/constraint_matrix.cc
index 0bc3e713c3..f5e9f7731a 100644
--- a/source/lac/constraint_matrix.cc
+++ b/source/lac/constraint_matrix.cc
@@ -1360,7 +1360,7 @@ MATRIX_FUNCTIONS(PETScWrappers::SparseMatrix);
 MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix);
 BLOCK_MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix);
 MATRIX_VECTOR_FUNCTIONS(PETScWrappers::MPI::SparseMatrix, PETScWrappers::MPI::Vector);
-BLOCK_MATRIX_VECTOR_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix ,PETScWrappers::MPI::BlockVector);
+BLOCK_MATRIX_VECTOR_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix,PETScWrappers::MPI::BlockVector);
 #endif
 
 #ifdef DEAL_II_WITH_TRILINOS
diff --git a/source/lac/petsc_parallel_sparse_matrix.cc b/source/lac/petsc_parallel_sparse_matrix.cc
index 1ae9dc3de7..48865c33cc 100644
--- a/source/lac/petsc_parallel_sparse_matrix.cc
+++ b/source/lac/petsc_parallel_sparse_matrix.cc
@@ -729,13 +729,13 @@ namespace PETScWrappers
     SparseMatrix::do_reinit (const SparsityPattern &,
                              const std::vector<size_type> &,
                              const std::vector<size_type> &,
-                             const unsigned int ,
+                             const unsigned int,
                              const bool);
     template void
     SparseMatrix::do_reinit (const DynamicSparsityPattern &,
                              const std::vector<size_type> &,
                              const std::vector<size_type> &,
-                             const unsigned int ,
+                             const unsigned int,
                              const bool);
 
     template void
diff --git a/source/lac/petsc_precondition.cc b/source/lac/petsc_precondition.cc
index 77f3dda669..d881f6997b 100644
--- a/source/lac/petsc_precondition.cc
+++ b/source/lac/petsc_precondition.cc
@@ -93,9 +93,9 @@ namespace PETScWrappers
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
 #if DEAL_II_PETSC_VERSION_LT(3, 5, 0)
-    ierr = PCSetOperators(pc , matrix, matrix, SAME_PRECONDITIONER);
+    ierr = PCSetOperators(pc, matrix, matrix, SAME_PRECONDITIONER);
 #else
-    ierr = PCSetOperators(pc , matrix, matrix);
+    ierr = PCSetOperators(pc, matrix, matrix);
 #endif
     AssertThrow (ierr == 0, ExcPETScError(ierr));
   }
diff --git a/source/lac/sparsity_pattern.cc b/source/lac/sparsity_pattern.cc
index 6cb9e252db..bc35387af8 100644
--- a/source/lac/sparsity_pattern.cc
+++ b/source/lac/sparsity_pattern.cc
@@ -1042,7 +1042,7 @@ template void SparsityPattern::copy_from<SparsityPattern> (const SparsityPattern
 template void SparsityPattern::copy_from<float> (const FullMatrix<float> &);
 template void SparsityPattern::copy_from<double> (const FullMatrix<double> &);
 
-template void SparsityPattern::add_entries<const SparsityPattern::size_type *> (const size_type ,
+template void SparsityPattern::add_entries<const SparsityPattern::size_type *> (const size_type,
     const size_type *,
     const size_type *,
     const bool);
diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc
index 00fc9dd74c..79cdf046dd 100644
--- a/source/lac/trilinos_sparse_matrix.cc
+++ b/source/lac/trilinos_sparse_matrix.cc
@@ -2224,7 +2224,7 @@ namespace TrilinosWrappers
       else Btmp = B_;
 
       // perform matrix-matrix product
-      ML_matmat_mult(A_, Btmp , &Ctmp);
+      ML_matmat_mult(A_, Btmp, &Ctmp);
 
       // release temporary structures we needed
       // for multiplication
diff --git a/source/numerics/error_estimator.inst.in b/source/numerics/error_estimator.inst.in
index a6975a1d9f..dd57268a94 100644
--- a/source/numerics/error_estimator.inst.in
+++ b/source/numerics/error_estimator.inst.in
@@ -36,7 +36,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
             Vector<float>           &,
             const ComponentMask &,
             const Function<deal_II_space_dimension>     *,
-            const unsigned int       ,
+            const unsigned int,
             const types::subdomain_id,
             const types::material_id,
             const KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::Strategy);
@@ -52,7 +52,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         Vector<float>           &,
         const ComponentMask &,
         const Function<deal_II_space_dimension>     *,
-        const unsigned int       ,
+        const unsigned int,
         const types::subdomain_id,
         const types::material_id,
         const KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::Strategy);
@@ -68,7 +68,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
             std::vector<Vector<float> *>         &,
             const ComponentMask &,
             const Function<deal_II_space_dimension>     *,
-            const unsigned int       ,
+            const unsigned int,
             const types::subdomain_id,
             const types::material_id,
             const KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::Strategy);
@@ -84,7 +84,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         std::vector<Vector<float> *>         &,
         const ComponentMask &,
         const Function<deal_II_space_dimension>     *,
-        const unsigned int       ,
+        const unsigned int,
         const types::subdomain_id,
         const types::material_id,
         const KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::Strategy);
@@ -100,7 +100,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
             Vector<float>           &,
             const ComponentMask &,
             const Function<deal_II_space_dimension>     *,
-            const unsigned int       ,
+            const unsigned int,
             const types::subdomain_id,
             const types::material_id,
             const KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::Strategy);
@@ -116,7 +116,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         Vector<float>           &,
         const ComponentMask &,
         const Function<deal_II_space_dimension>     *,
-        const unsigned int       ,
+        const unsigned int,
         const types::subdomain_id,
         const types::material_id,
         const KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::Strategy);
@@ -132,7 +132,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
             std::vector<Vector<float> *>         &,
             const ComponentMask &,
             const Function<deal_II_space_dimension>     *,
-            const unsigned int       ,
+            const unsigned int,
             const types::subdomain_id,
             const types::material_id,
             const KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::Strategy);
@@ -148,7 +148,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         std::vector<Vector<float> *>         &,
         const ComponentMask &,
         const Function<deal_II_space_dimension>     *,
-        const unsigned int       ,
+        const unsigned int,
         const types::subdomain_id,
         const types::material_id,
         const KellyErrorEstimator<deal_II_dimension, deal_II_space_dimension>::Strategy);
diff --git a/source/numerics/error_estimator_1d.inst.in b/source/numerics/error_estimator_1d.inst.in
index 10e154d82a..ff93b0db6d 100644
--- a/source/numerics/error_estimator_1d.inst.in
+++ b/source/numerics/error_estimator_1d.inst.in
@@ -29,7 +29,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
             Vector<float>           &,
             const ComponentMask &,
             const Function<deal_II_space_dimension>     *,
-            const unsigned int       ,
+            const unsigned int,
             const types::subdomain_id,
             const types::material_id);
 
@@ -44,7 +44,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         Vector<float>           &,
         const ComponentMask &,
         const Function<deal_II_space_dimension>     *,
-        const unsigned int       ,
+        const unsigned int,
         const types::subdomain_id,
         const types::material_id);
 
@@ -59,7 +59,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
             std::vector<Vector<float> *>         &,
             const ComponentMask &,
             const Function<deal_II_space_dimension>     *,
-            const unsigned int       ,
+            const unsigned int,
             const types::subdomain_id,
             const types::material_id);
 
@@ -74,7 +74,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         std::vector<Vector<float> *>         &,
         const ComponentMask &,
         const Function<deal_II_space_dimension>     *,
-        const unsigned int       ,
+        const unsigned int,
         const types::subdomain_id,
         const types::material_id);
 
@@ -89,7 +89,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
             Vector<float>           &,
             const ComponentMask &,
             const Function<deal_II_space_dimension>     *,
-            const unsigned int       ,
+            const unsigned int,
             const types::subdomain_id,
             const types::material_id);
 
@@ -104,7 +104,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         Vector<float>           &,
         const ComponentMask &,
         const Function<deal_II_space_dimension>     *,
-        const unsigned int       ,
+        const unsigned int,
         const types::subdomain_id,
         const types::material_id);
 
@@ -119,7 +119,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
             std::vector<Vector<float> *>         &,
             const ComponentMask &,
             const Function<deal_II_space_dimension>     *,
-            const unsigned int       ,
+            const unsigned int,
             const types::subdomain_id,
             const types::material_id);
 
@@ -134,7 +134,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         std::vector<Vector<float> *>         &,
         const ComponentMask &,
         const Function<deal_II_space_dimension>     *,
-        const unsigned int       ,
+        const unsigned int,
         const types::subdomain_id,
         const types::material_id);
 
diff --git a/source/opencascade/utilities.cc b/source/opencascade/utilities.cc
index a5cc591db7..e3feaffbd8 100644
--- a/source/opencascade/utilities.cc
+++ b/source/opencascade/utilities.cc
@@ -337,7 +337,7 @@ namespace OpenCASCADE
     gp_Pnt PIn(0.0,0.0,0.0);
     gp_Pnt PFin(0.0,0.0,0.0);
     gp_Pnt PMid(0.0,0.0,0.0);
-    TopExp_Explorer edgeExplorer(edges , TopAbs_EDGE);
+    TopExp_Explorer edgeExplorer(edges, TopAbs_EDGE);
     TopoDS_Edge edge;
     while (edgeExplorer.More())
       {
diff --git a/tests/base/product_type_04.cc b/tests/base/product_type_04.cc
index 2489b6a4dc..31c9f8ced3 100644
--- a/tests/base/product_type_04.cc
+++ b/tests/base/product_type_04.cc
@@ -44,7 +44,7 @@ int main()
     t[2] = 3.69258;
     AssertThrow (7*t == 7.0 * t, ExcInternalError());
     AssertThrow (t*7 == t * 7.0, ExcInternalError());
-    AssertThrow (t*7 == 7*t    , ExcInternalError());
+    AssertThrow (t*7 == 7*t, ExcInternalError());
     AssertThrow ((t*7 - (t+t+t+t+t+t+t)).norm() < 1e-12, ExcInternalError());
   }
 
@@ -58,7 +58,7 @@ int main()
     t[1][1] = 3.35792;
     AssertThrow (7*t == 7.0 * t, ExcInternalError());
     AssertThrow (t*7 == t * 7.0, ExcInternalError());
-    AssertThrow (t*7 == 7*t    , ExcInternalError());
+    AssertThrow (t*7 == 7*t, ExcInternalError());
     AssertThrow ((t*7 - (t+t+t+t+t+t+t)).norm() < 1e-12, ExcInternalError());
   }
 
diff --git a/tests/base/product_type_04_symmetric.cc b/tests/base/product_type_04_symmetric.cc
index 5e4edd3bd8..2141a1be7a 100644
--- a/tests/base/product_type_04_symmetric.cc
+++ b/tests/base/product_type_04_symmetric.cc
@@ -43,7 +43,7 @@ int main()
     t[1][1] = 3.35792;
     AssertThrow (7*t == 7.0 * t, ExcInternalError());
     AssertThrow (t*7 == t * 7.0, ExcInternalError());
-    AssertThrow (t*7 == 7*t    , ExcInternalError());
+    AssertThrow (t*7 == 7*t, ExcInternalError());
     AssertThrow ((t*7 - (t+t+t+t+t+t+t)).norm() < 1e-12, ExcInternalError());
   }
 
diff --git a/tests/dofs/interpolate_q_system_02.cc b/tests/dofs/interpolate_q_system_02.cc
index 311fe37390..b6afa2fc0d 100644
--- a/tests/dofs/interpolate_q_system_02.cc
+++ b/tests/dofs/interpolate_q_system_02.cc
@@ -81,7 +81,7 @@ void test ()
     {
       FE_Q<dim> fe1(p);
       FE_Q<dim> fe2(p+1);
-      FESystem<dim> fe(fe1, 2, fe2 , 1);
+      FESystem<dim> fe(fe1, 2, fe2, 1);
       DoFHandler<dim> dof_handler(triangulation);
       dof_handler.distribute_dofs (fe);
 
diff --git a/tests/dofs/interpolate_q_system_mask_02.cc b/tests/dofs/interpolate_q_system_mask_02.cc
index 1626bcaa50..9c064258b5 100644
--- a/tests/dofs/interpolate_q_system_mask_02.cc
+++ b/tests/dofs/interpolate_q_system_mask_02.cc
@@ -83,7 +83,7 @@ void test ()
     {
       FE_Q<dim> fe1(p);
       FE_Q<dim> fe2(p+1);
-      FESystem<dim> fe(fe1, 2, fe2 , 1);
+      FESystem<dim> fe(fe1, 2, fe2, 1);
       DoFHandler<dim> dof_handler(triangulation);
       dof_handler.distribute_dofs (fe);
 
diff --git a/tests/fe/fe_enriched_compare_to_fe_system.cc b/tests/fe/fe_enriched_compare_to_fe_system.cc
index f19cb7c120..65cf687855 100644
--- a/tests/fe/fe_enriched_compare_to_fe_system.cc
+++ b/tests/fe/fe_enriched_compare_to_fe_system.cc
@@ -135,7 +135,7 @@ void check_consistency(const Point<dim>    &p,
   // product rule:
   const double                 v_s = v_s0 + v_s1 * v_f;
   const Tensor<1,dim>          g_s = g_s0 + g_s1 * v_f + v_s1 * g_f;
-  Tensor<2,dim>                 op = outer_product(g_s1 , g_f );
+  Tensor<2,dim>                 op = outer_product(g_s1, g_f );
 
   const SymmetricTensor<2,dim> sp = symmetrize (op) * 2.0; // symmetrize does [s+s^T]/2
   // Hessians should be symmetric, but due to round off errors and the fact
diff --git a/tests/fe/fe_enriched_compare_to_fe_system_2.cc b/tests/fe/fe_enriched_compare_to_fe_system_2.cc
index ca0e3c8468..083b92c8bc 100644
--- a/tests/fe/fe_enriched_compare_to_fe_system_2.cc
+++ b/tests/fe/fe_enriched_compare_to_fe_system_2.cc
@@ -163,9 +163,9 @@ void check_consistency(const Point<dim>    &p,
   const Tensor<1,dim>          g_s = g_s0 + g_s1 * v_f1 + v_s1 * g_f1
                                      + g_s2 * v_f2 + v_s2 * g_f2
                                      + g_s3 * v_f3 + v_s3 * g_f3;
-  Tensor<2,dim> op1 = outer_product(g_s1 , g_f1 ),
-                op2 = outer_product(g_s2 , g_f2 ),
-                op3 = outer_product(g_s3 , g_f3 );
+  Tensor<2,dim> op1 = outer_product(g_s1, g_f1 ),
+                op2 = outer_product(g_s2, g_f2 ),
+                op3 = outer_product(g_s3, g_f3 );
 
   const SymmetricTensor<2,dim> sp1 = symmetrize (op1) * 2.0; // symmetrize does [s+s^T]/2
   const SymmetricTensor<2,dim> sp2 = symmetrize (op2) * 2.0; // symmetrize does [s+s^T]/2
diff --git a/tests/full_matrix/full_matrix_56.cc b/tests/full_matrix/full_matrix_56.cc
index f99d26235e..d45670fe77 100644
--- a/tests/full_matrix/full_matrix_56.cc
+++ b/tests/full_matrix/full_matrix_56.cc
@@ -22,7 +22,7 @@
 
 
 
-const double entries2[4] =  { 0.814723686393179 ,  0.516389376684563,
+const double entries2[4] =  { 0.814723686393179,  0.516389376684563,
                               0.516389376684563,   0.913375856139019
                             };
 
diff --git a/tests/gla/vec_03.cc b/tests/gla/vec_03.cc
index 8842ddb306..4639747f5c 100644
--- a/tests/gla/vec_03.cc
+++ b/tests/gla/vec_03.cc
@@ -75,7 +75,7 @@ void test ()
 
   ConstraintMatrix cm;
   cm.add_line(1);
-  cm.add_entry(1 ,2, 3.0);
+  cm.add_entry(1,2, 3.0);
   cm.close();
 
   if (myid==0)
diff --git a/tests/grid/build_triangulation_from_patch_01.cc b/tests/grid/build_triangulation_from_patch_01.cc
index 7e39c3bf17..7260481004 100644
--- a/tests/grid/build_triangulation_from_patch_01.cc
+++ b/tests/grid/build_triangulation_from_patch_01.cc
@@ -50,7 +50,7 @@ void test()
         = GridTools::get_patch_around_cell<Triangulation<dim> > (cell);
 
       Triangulation<dim> local_triangulation(Triangulation<dim>::limit_level_difference_at_vertices);
-      std::map<typename Triangulation<dim>::active_cell_iterator ,
+      std::map<typename Triangulation<dim>::active_cell_iterator,
           typename Triangulation<dim>::active_cell_iterator> patch_to_global_tria_map;
 
       GridTools::build_triangulation_from_patch <Triangulation<dim> >
diff --git a/tests/grid/build_triangulation_from_patch_02.cc b/tests/grid/build_triangulation_from_patch_02.cc
index 58cf4a78d3..d39383cd31 100644
--- a/tests/grid/build_triangulation_from_patch_02.cc
+++ b/tests/grid/build_triangulation_from_patch_02.cc
@@ -52,7 +52,7 @@ void test()
         = GridTools::get_patch_around_cell<Triangulation<dim> > (cell);
 
       Triangulation<dim> local_triangulation(Triangulation<dim>::limit_level_difference_at_vertices);
-      std::map<typename Triangulation<dim>::active_cell_iterator , typename Triangulation<dim>::active_cell_iterator>  patch_to_global_tria_map;
+      std::map<typename Triangulation<dim>::active_cell_iterator, typename Triangulation<dim>::active_cell_iterator>  patch_to_global_tria_map;
 
       GridTools::build_triangulation_from_patch <Triangulation<dim> >
       (patch_cells,local_triangulation,patch_to_global_tria_map);
diff --git a/tests/grid/build_triangulation_from_patch_03.cc b/tests/grid/build_triangulation_from_patch_03.cc
index 8ff04ecd71..d36372228b 100644
--- a/tests/grid/build_triangulation_from_patch_03.cc
+++ b/tests/grid/build_triangulation_from_patch_03.cc
@@ -57,7 +57,7 @@ void test()
         = GridTools::get_patch_around_cell<Triangulation<dim> > (cell);
 
       Triangulation<dim> local_triangulation(Triangulation<dim>::limit_level_difference_at_vertices);
-      std::map<typename Triangulation<dim>::active_cell_iterator ,
+      std::map<typename Triangulation<dim>::active_cell_iterator,
           typename Triangulation<dim>::active_cell_iterator> patch_to_global_tria_map;
 
       GridTools::build_triangulation_from_patch <Triangulation<dim> >
diff --git a/tests/grid/build_triangulation_from_patch_04.cc b/tests/grid/build_triangulation_from_patch_04.cc
index 8560b41ce8..051672e512 100644
--- a/tests/grid/build_triangulation_from_patch_04.cc
+++ b/tests/grid/build_triangulation_from_patch_04.cc
@@ -63,7 +63,7 @@ void test()
         = GridTools::get_patch_around_cell<Triangulation<dim> > (cell);
 
       Triangulation<dim> local_triangulation(Triangulation<dim>::limit_level_difference_at_vertices);
-      std::map<typename Triangulation<dim>::active_cell_iterator , typename Triangulation<dim>::active_cell_iterator>  patch_to_global_tria_map;
+      std::map<typename Triangulation<dim>::active_cell_iterator, typename Triangulation<dim>::active_cell_iterator>  patch_to_global_tria_map;
 
       GridTools::build_triangulation_from_patch <Triangulation<dim> >
       (patch_cells,local_triangulation,patch_to_global_tria_map);
diff --git a/tests/grid/get_cells_at_coarsest_common_level_02.cc b/tests/grid/get_cells_at_coarsest_common_level_02.cc
index c08bb0c87e..ea9392af37 100644
--- a/tests/grid/get_cells_at_coarsest_common_level_02.cc
+++ b/tests/grid/get_cells_at_coarsest_common_level_02.cc
@@ -62,7 +62,7 @@ void test()
       std::sort(coarse_cells.begin(), coarse_cells.end());
 
       for (unsigned int i=0; i<patch_cells.size(); ++i)
-        Assert (patch_cells[i]==coarse_cells[i] ,ExcInternalError());
+        Assert (patch_cells[i]==coarse_cells[i],ExcInternalError());
 
       deallog << "coarse_ cells " << cell << ": ";
       for (unsigned int i=0; i<coarse_cells.size(); ++i)
diff --git a/tests/grid/grid_test.cc b/tests/grid/grid_test.cc
index a3c56fec0c..894588cbbf 100644
--- a/tests/grid/grid_test.cc
+++ b/tests/grid/grid_test.cc
@@ -171,7 +171,7 @@ template <int dim>
 void test (const int test_case)
 {
   char testname[100];
-  sprintf(testname, "Test%d.dim%d", test_case , dim);
+  sprintf(testname, "Test%d.dim%d", test_case, dim);
 
   deallog.push(testname);
   deallog << "Start" << std::endl;
diff --git a/tests/hp/fe_nothing_18.cc b/tests/hp/fe_nothing_18.cc
index ead53cc602..125c478530 100644
--- a/tests/hp/fe_nothing_18.cc
+++ b/tests/hp/fe_nothing_18.cc
@@ -329,8 +329,8 @@ void ElasticProblem<dim>::setup_system ()
   BlockDynamicSparsityPattern dynamic_sparsity_pattern(n_blocks,
                                                        n_blocks);
 
-  dynamic_sparsity_pattern.block(u_block     ,u_block     ).reinit(dofs_per_block[u_block]     ,dofs_per_block[u_block]);
-  dynamic_sparsity_pattern.block(u_block     ,lambda_block).reinit(dofs_per_block[u_block]     ,dofs_per_block[lambda_block]);
+  dynamic_sparsity_pattern.block(u_block,u_block     ).reinit(dofs_per_block[u_block],dofs_per_block[u_block]);
+  dynamic_sparsity_pattern.block(u_block,lambda_block).reinit(dofs_per_block[u_block],dofs_per_block[lambda_block]);
   dynamic_sparsity_pattern.block(lambda_block,u_block     ).reinit(dofs_per_block[lambda_block],dofs_per_block[u_block]);
   dynamic_sparsity_pattern.block(lambda_block,lambda_block).reinit(dofs_per_block[lambda_block],dofs_per_block[lambda_block]);
 
diff --git a/tests/integrators/advection_01.cc b/tests/integrators/advection_01.cc
index f2a0c0e5cb..514bbc1635 100644
--- a/tests/integrators/advection_01.cc
+++ b/tests/integrators/advection_01.cc
@@ -85,7 +85,7 @@ void test_boundary(const FEValuesBase<dim> &fev)
   const unsigned int n = fev.dofs_per_cell;
   unsigned int d=fev.get_fe().n_components();
   FullMatrix<double> M(n,n);
-  std::vector<std::vector<double> > vel(dim ,std::vector<double>(1));
+  std::vector<std::vector<double> > vel(dim,std::vector<double>(1));
   vel[0][0]=1.;
   vel[1][0]=1.;
   if (dim > 2)
@@ -143,7 +143,7 @@ void test_face(const FEValuesBase<dim> &fev1,
   FullMatrix<double> M12(n1,n2);
   FullMatrix<double> M21(n2,n1);
   FullMatrix<double> M22(n2,n2);
-  std::vector<std::vector<double> > vel(dim ,std::vector<double>(1));
+  std::vector<std::vector<double> > vel(dim,std::vector<double>(1));
   vel[0][0]=1.;
   vel[1][0]=1.;
   if (dim > 2)
diff --git a/tests/lac/constraints.cc b/tests/lac/constraints.cc
index 3167def163..d86654403a 100644
--- a/tests/lac/constraints.cc
+++ b/tests/lac/constraints.cc
@@ -152,7 +152,7 @@ void make_tria (Triangulation<3> &tria, int step)
                                       Point<3>(1,1,2),
                                       Point<3>(0,1,2)
                                     };
-      const int cell_vertices[2][8] = { { 0,1,2,3,4,5,6,7 }, { 3, 2, 8, 9 , 7, 6, 10, 11} };
+      const int cell_vertices[2][8] = { { 0,1,2,3,4,5,6,7 }, { 3, 2, 8, 9, 7, 6, 10, 11} };
       std::vector<CellData<3> > cells (2, CellData<3>());
       for (unsigned int cell=0; cell<2; ++cell)
         for (unsigned int j=0; j<8; ++j)
diff --git a/tests/lac/schur_complement_05.cc b/tests/lac/schur_complement_05.cc
index 0f8394e99a..2351fdfc0a 100644
--- a/tests/lac/schur_complement_05.cc
+++ b/tests/lac/schur_complement_05.cc
@@ -287,7 +287,7 @@ namespace Step22
     triangulation (mpi_communicator/*,
                    Triangulation<dim>::maximum_smoothing*/),
     fe (FE_Q<dim>(degree+1), dim,
-        FE_Q<dim>(degree)  , 1),
+        FE_Q<dim>(degree), 1),
     dof_handler (triangulation),
     pcout (Utilities::MPI::this_mpi_process(mpi_communicator)
            == 0
diff --git a/tests/matrix_free/create_mesh.h b/tests/matrix_free/create_mesh.h
index c626b92924..44d1b1a002 100644
--- a/tests/matrix_free/create_mesh.h
+++ b/tests/matrix_free/create_mesh.h
@@ -27,8 +27,8 @@ void create_mesh (Triangulation<2> &tria,
   // 1. cube cell
   points[0] = Point<dim> (0, 0);
   points[1] = Point<dim> (0, 1);
-  points[2] = Point<dim> (1 ,0);
-  points[3] = Point<dim> (1 ,1);
+  points[2] = Point<dim> (1,0);
+  points[3] = Point<dim> (1,1);
 
   // 2. rectangular cell
   points[4] = Point<dim> (3., 0);
diff --git a/tests/matrix_free/matrix_vector_stokes.cc b/tests/matrix_free/matrix_vector_stokes.cc
index 5cb39ac9ff..9d2e575d93 100644
--- a/tests/matrix_free/matrix_vector_stokes.cc
+++ b/tests/matrix_free/matrix_vector_stokes.cc
@@ -71,7 +71,7 @@ public:
   {
     typedef VectorizedArray<Number> vector_t;
     FEEvaluation<dim,degree_p+1,degree_p+2,dim,Number> velocity (data, 0);
-    FEEvaluation<dim,degree_p  ,degree_p+2,1,  Number> pressure (data, 1);
+    FEEvaluation<dim,degree_p,degree_p+2,1,  Number> pressure (data, 1);
 
     for (unsigned int cell=cell_range.first; cell<cell_range.second; ++cell)
       {
diff --git a/tests/matrix_free/matrix_vector_stokes_qdg0.cc b/tests/matrix_free/matrix_vector_stokes_qdg0.cc
index 4f7cde1204..37ef839b9f 100644
--- a/tests/matrix_free/matrix_vector_stokes_qdg0.cc
+++ b/tests/matrix_free/matrix_vector_stokes_qdg0.cc
@@ -72,7 +72,7 @@ public:
   {
     typedef VectorizedArray<Number> vector_t;
     FEEvaluation<dim,degree_p+1,degree_p+2,dim,Number> velocity (data, 0);
-    FEEvaluation<dim,degree_p  ,degree_p+2,1,  Number> pressure (data, 1);
+    FEEvaluation<dim,degree_p,degree_p+2,1,  Number> pressure (data, 1);
 
     for (unsigned int cell=cell_range.first; cell<cell_range.second; ++cell)
       {
diff --git a/tests/mpi/muelu_periodicity.cc b/tests/mpi/muelu_periodicity.cc
index 25258e7504..b1ca2e8f31 100644
--- a/tests/mpi/muelu_periodicity.cc
+++ b/tests/mpi/muelu_periodicity.cc
@@ -283,7 +283,7 @@ namespace Step22
     triangulation (mpi_communicator/*,
                    Triangulation<dim>::maximum_smoothing*/),
     fe (FE_Q<dim>(degree+1), dim,
-        FE_Q<dim>(degree)  , 1),
+        FE_Q<dim>(degree), 1),
     dof_handler (triangulation),
     pcout (Utilities::MPI::this_mpi_process(mpi_communicator)
            == 0
diff --git a/tests/mpi/periodic_neighbor_01.cc b/tests/mpi/periodic_neighbor_01.cc
index b1ae7bcdbe..037ef26ed6 100755
--- a/tests/mpi/periodic_neighbor_01.cc
+++ b/tests/mpi/periodic_neighbor_01.cc
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
 {
   try
     {
-      Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv ,1);
+      Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv,1);
       MPILogInitAll log;
 
       periodicity_tests<2> test_2D;
diff --git a/tests/mpi/periodicity_02.cc b/tests/mpi/periodicity_02.cc
index d478df0b01..9e74fb959b 100644
--- a/tests/mpi/periodicity_02.cc
+++ b/tests/mpi/periodicity_02.cc
@@ -285,7 +285,7 @@ namespace Step22
     triangulation (mpi_communicator/*,
                    Triangulation<dim>::maximum_smoothing*/),
     fe (FE_Q<dim>(degree+1), dim,
-        FE_Q<dim>(degree)  , 1),
+        FE_Q<dim>(degree), 1),
     dof_handler (triangulation),
     pcout (Utilities::MPI::this_mpi_process(mpi_communicator)
            == 0
diff --git a/tests/mpi/periodicity_03.cc b/tests/mpi/periodicity_03.cc
index ce3f00f211..df0291eadf 100644
--- a/tests/mpi/periodicity_03.cc
+++ b/tests/mpi/periodicity_03.cc
@@ -208,7 +208,7 @@ namespace Step22
     triangulation (mpi_communicator/*,
                    Triangulation<dim>::maximum_smoothing*/),
     fe (FE_Q<dim>(degree+1), dim,
-        FE_Q<dim>(degree)  , 1),
+        FE_Q<dim>(degree), 1),
     dof_handler (triangulation),
     pcout (Utilities::MPI::this_mpi_process(mpi_communicator)
            == 0
diff --git a/tests/trilinos/trilinos_sparsity_pattern_02.cc b/tests/trilinos/trilinos_sparsity_pattern_02.cc
index 46f7998bc9..9144ef4ca5 100644
--- a/tests/trilinos/trilinos_sparsity_pattern_02.cc
+++ b/tests/trilinos/trilinos_sparsity_pattern_02.cc
@@ -70,7 +70,7 @@ namespace Step22
     triangulation (mpi_communicator/*,
                    Triangulation<dim>::maximum_smoothing*/),
     fe (FE_Q<dim>(degree+1), dim,
-        FE_Q<dim>(degree)  , 1),
+        FE_Q<dim>(degree), 1),
     dof_handler (triangulation)
   {}
 
-- 
2.39.5