From 62b7395c4b00b091bafc404f051272d65517daf5 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Sun, 30 Oct 2016 20:26:32 +0100 Subject: [PATCH] Fix compilation with gcc-5.3 --- include/deal.II/matrix_free/fe_evaluation.h | 2 + include/deal.II/matrix_free/operators.h | 3 +- .../deal.II/numerics/vector_tools.templates.h | 37 ++++++++++--------- 3 files changed, 23 insertions(+), 19 deletions(-) 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 &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::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 &src, const std::pair &cell_range) const { - FEEvaluation phi(*Base::data); + FEEvaluation phi(data); for (unsigned int cell=cell_range.first; cell + template void project_parallel (const MatrixFree &matrix_free, const ConstraintMatrix &constraints, const std_cxx11::function< VectorizedArray (const unsigned int, const unsigned int)> func, VectorType &vec_result) { - const DoFHandler &dof = matrix_free.get_dof_handler(); + const DoFHandler &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 (mapping,dof,constraints,quadrature,func,vec_result); + project_parallel (mapping,dof,constraints,quadrature,func,vec_result); break; case 2: - project_parallel (mapping,dof,constraints,quadrature,func,vec_result); + project_parallel (mapping,dof,constraints,quadrature,func,vec_result); break; case 3: - project_parallel (mapping,dof,constraints,quadrature,func,vec_result); + project_parallel (mapping,dof,constraints,quadrature,func,vec_result); break; case 4: - project_parallel (mapping,dof,constraints,quadrature,func,vec_result); + project_parallel (mapping,dof,constraints,quadrature,func,vec_result); break; case 5: - project_parallel (mapping,dof,constraints,quadrature,func,vec_result); + project_parallel (mapping,dof,constraints,quadrature,func,vec_result); break; case 6: - project_parallel (mapping,dof,constraints,quadrature,func,vec_result); + project_parallel (mapping,dof,constraints,quadrature,func,vec_result); break; case 7: - project_parallel (mapping,dof,constraints,quadrature,func,vec_result); + project_parallel (mapping,dof,constraints,quadrature,func,vec_result); break; case 8: - project_parallel (mapping,dof,constraints,quadrature,func,vec_result); + project_parallel (mapping,dof,constraints,quadrature,func,vec_result); break; default: Assert (false, ExcNotImplemented()); @@ -1108,6 +1108,7 @@ namespace VectorTools const std_cxx11::function< VectorizedArray (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 (matrix_free,constraints,func,vec_result); + project_parallel (matrix_free,constraints,func,vec_result); break; case 2: - project_parallel (matrix_free,constraints,func,vec_result); + project_parallel (matrix_free,constraints,func,vec_result); break; case 3: - project_parallel (matrix_free,constraints,func,vec_result); + project_parallel (matrix_free,constraints,func,vec_result); break; case 4: - project_parallel (matrix_free,constraints,func,vec_result); + project_parallel (matrix_free,constraints,func,vec_result); break; case 5: - project_parallel (matrix_free,constraints,func,vec_result); + project_parallel (matrix_free,constraints,func,vec_result); break; case 6: - project_parallel (matrix_free,constraints,func,vec_result); + project_parallel (matrix_free,constraints,func,vec_result); break; case 7: - project_parallel (matrix_free,constraints,func,vec_result); + project_parallel (matrix_free,constraints,func,vec_result); break; case 8: - project_parallel (matrix_free,constraints,func,vec_result); + project_parallel (matrix_free,constraints,func,vec_result); break; default: Assert (false, ExcNotImplemented()); -- 2.39.5