From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Sun, 30 Oct 2016 19:26:32 +0000 (+0100)
Subject: Fix compilation with gcc-5.3
X-Git-Tag: v8.5.0-rc1~517^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3320%2Fhead;p=dealii.git

Fix compilation with gcc-5.3
---

diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
index c72adc88cb..d90cc5a220 100644
--- a/include/deal.II/matrix_free/fe_evaluation.h
+++ b/include/deal.II/matrix_free/fe_evaluation.h
@@ -2455,6 +2455,8 @@ namespace internal
   void check_vector_compatibility (const LinearAlgebra::distributed::Vector<Number> &vec,
                                    const internal::MatrixFreeFunctions::DoFInfo     &dof_info)
   {
+    (void) vec;
+    (void) dof_info;
     Assert (vec.partitioners_are_compatible(*dof_info.vector_partitioner),
             ExcMessage("The parallel layout of the given vector is not "
                        "compatible with the parallel partitioning in MatrixFree. "
diff --git a/include/deal.II/matrix_free/operators.h b/include/deal.II/matrix_free/operators.h
index a39e7ddb07..f9287d5460 100644
--- a/include/deal.II/matrix_free/operators.h
+++ b/include/deal.II/matrix_free/operators.h
@@ -495,6 +495,7 @@ namespace MatrixFreeOperators
   Base<dim,Number>::el (const unsigned int row,
                         const unsigned int col) const
   {
+    (void) col;
     Assert (row == col, ExcNotImplemented());
     Assert (inverse_diagonal_entries.size() > 0, ExcNotInitialized());
     return 1.0/inverse_diagonal_entries(row);
@@ -820,7 +821,7 @@ namespace MatrixFreeOperators
                     const LinearAlgebra::distributed::Vector<Number> &src,
                     const std::pair<unsigned int,unsigned int>  &cell_range) const
   {
-    FEEvaluation<dim, fe_degree, fe_degree+1, n_components, Number> phi(*Base<dim, Number>::data);
+    FEEvaluation<dim, fe_degree, fe_degree+1, n_components, Number> phi(data);
     for (unsigned int cell=cell_range.first; cell<cell_range.second; ++cell)
       {
         phi.reinit (cell);
diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h
index 0040f2cacd..453e4aa351 100644
--- a/include/deal.II/numerics/vector_tools.templates.h
+++ b/include/deal.II/numerics/vector_tools.templates.h
@@ -988,13 +988,13 @@ namespace VectorTools
 
 
 
-    template <int dim, typename VectorType, int fe_degree, int n_q_points_1d>
+    template <int dim, typename VectorType, int spacedim, int fe_degree, int n_q_points_1d>
     void project_parallel (const MatrixFree<dim,typename VectorType::value_type> &matrix_free,
                            const ConstraintMatrix &constraints,
                            const std_cxx11::function< VectorizedArray<typename VectorType::value_type> (const unsigned int, const unsigned int)> func,
                            VectorType &vec_result)
     {
-      const DoFHandler<dim> &dof = matrix_free.get_dof_handler();
+      const DoFHandler<dim,spacedim> &dof = matrix_free.get_dof_handler();
 
       typedef typename VectorType::value_type Number;
       Assert (dof.get_fe().n_components() == 1,
@@ -1071,28 +1071,28 @@ namespace VectorTools
     switch (dof.get_fe().degree)
       {
       case 1:
-        project_parallel<dim, VectorType,spacedim,1> (mapping,dof,constraints,quadrature,func,vec_result);
+        project_parallel<dim,VectorType,spacedim,1> (mapping,dof,constraints,quadrature,func,vec_result);
         break;
       case 2:
-        project_parallel<dim, VectorType,spacedim,2> (mapping,dof,constraints,quadrature,func,vec_result);
+        project_parallel<dim,VectorType,spacedim,2> (mapping,dof,constraints,quadrature,func,vec_result);
         break;
       case 3:
-        project_parallel<dim, VectorType,spacedim,3> (mapping,dof,constraints,quadrature,func,vec_result);
+        project_parallel<dim,VectorType,spacedim,3> (mapping,dof,constraints,quadrature,func,vec_result);
         break;
       case 4:
-        project_parallel<dim, VectorType,spacedim,4> (mapping,dof,constraints,quadrature,func,vec_result);
+        project_parallel<dim,VectorType,spacedim,4> (mapping,dof,constraints,quadrature,func,vec_result);
         break;
       case 5:
-        project_parallel<dim, VectorType,spacedim,5> (mapping,dof,constraints,quadrature,func,vec_result);
+        project_parallel<dim,VectorType,spacedim,5> (mapping,dof,constraints,quadrature,func,vec_result);
         break;
       case 6:
-        project_parallel<dim, VectorType,spacedim,6> (mapping,dof,constraints,quadrature,func,vec_result);
+        project_parallel<dim,VectorType,spacedim,6> (mapping,dof,constraints,quadrature,func,vec_result);
         break;
       case 7:
-        project_parallel<dim, VectorType,spacedim,7> (mapping,dof,constraints,quadrature,func,vec_result);
+        project_parallel<dim,VectorType,spacedim,7> (mapping,dof,constraints,quadrature,func,vec_result);
         break;
       case 8:
-        project_parallel<dim, VectorType,spacedim,8> (mapping,dof,constraints,quadrature,func,vec_result);
+        project_parallel<dim,VectorType,spacedim,8> (mapping,dof,constraints,quadrature,func,vec_result);
         break;
       default:
         Assert (false, ExcNotImplemented());
@@ -1108,6 +1108,7 @@ namespace VectorTools
                 const std_cxx11::function< VectorizedArray<typename VectorType::value_type> (const unsigned int, const unsigned int)> func,
                 VectorType &vec_result)
   {
+    (void) n_q_points_1d;
     const unsigned int fe_degree = matrix_free.get_dof_handler().get_fe().degree;
 
     Assert (fe_degree+1 == n_q_points_1d,
@@ -1116,28 +1117,28 @@ namespace VectorTools
     switch (fe_degree)
       {
       case 1:
-        project_parallel<dim, VectorType,1,2> (matrix_free,constraints,func,vec_result);
+        project_parallel<dim,VectorType,dim,1,2> (matrix_free,constraints,func,vec_result);
         break;
       case 2:
-        project_parallel<dim, VectorType,2,3> (matrix_free,constraints,func,vec_result);
+        project_parallel<dim,VectorType,dim,2,3> (matrix_free,constraints,func,vec_result);
         break;
       case 3:
-        project_parallel<dim, VectorType,3,4> (matrix_free,constraints,func,vec_result);
+        project_parallel<dim,VectorType,dim,3,4> (matrix_free,constraints,func,vec_result);
         break;
       case 4:
-        project_parallel<dim, VectorType,4,5> (matrix_free,constraints,func,vec_result);
+        project_parallel<dim,VectorType,dim,4,5> (matrix_free,constraints,func,vec_result);
         break;
       case 5:
-        project_parallel<dim, VectorType,5,6> (matrix_free,constraints,func,vec_result);
+        project_parallel<dim,VectorType,dim,5,6> (matrix_free,constraints,func,vec_result);
         break;
       case 6:
-        project_parallel<dim, VectorType,6,7> (matrix_free,constraints,func,vec_result);
+        project_parallel<dim,VectorType,dim,6,7> (matrix_free,constraints,func,vec_result);
         break;
       case 7:
-        project_parallel<dim, VectorType,7,8> (matrix_free,constraints,func,vec_result);
+        project_parallel<dim,VectorType,dim,7,8> (matrix_free,constraints,func,vec_result);
         break;
       case 8:
-        project_parallel<dim, VectorType,8,9> (matrix_free,constraints,func,vec_result);
+        project_parallel<dim,VectorType,dim,8,9> (matrix_free,constraints,func,vec_result);
         break;
       default:
         Assert (false, ExcNotImplemented());