From 58168709b85e5d784ca2fa75f078530dad42557e Mon Sep 17 00:00:00 2001 From: David Wells <drwells@vt.edu> Date: Sat, 4 Apr 2015 11:49:40 -0400 Subject: [PATCH] When obvious, do not name unused parameters. Rather than writing Triangulation<dim> &/*tria*/ where tria is a redundant name, I simply leave the unused parameter name blank. --- source/fe/fe_face.cc | 2 +- source/grid/grid_generator.cc | 4 ++-- source/grid/grid_out.cc | 2 +- source/numerics/matrix_tools.cc | 21 ++++++++++----------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/source/fe/fe_face.cc b/source/fe/fe_face.cc index 27b57ae179..2b8d7df436 100644 --- a/source/fe/fe_face.cc +++ b/source/fe/fe_face.cc @@ -535,7 +535,7 @@ FE_FaceQ<1,spacedim>::fill_fe_face_values ( const Mapping<1,spacedim> &, const typename Triangulation<1,spacedim>::cell_iterator &, const unsigned int face, - const Quadrature<0> &quadrature, + const Quadrature<0> &, typename Mapping<1,spacedim>::InternalDataBase &, typename Mapping<1,spacedim>::InternalDataBase &fedata, FEValuesData<1,spacedim> &data) const diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc index 3a5e2ef43d..fa5f966efb 100644 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@ -611,7 +611,7 @@ namespace GridGenerator template<> void - parallelogram (Triangulation<3> &tria, + parallelogram (Triangulation<3> &, const Point<3> (&/*corners*/)[3], const bool /*colorize*/) { @@ -620,7 +620,7 @@ namespace GridGenerator template<> void - parallelogram (Triangulation<1> &tria, + parallelogram (Triangulation<1> &, const Point<1> (&/*corners*/)[1], const bool /*colorize*/) { diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc index ce7f07d6b7..f94f424ef0 100644 --- a/source/grid/grid_out.cc +++ b/source/grid/grid_out.cc @@ -1407,7 +1407,7 @@ void GridOut::write_xfig ( template <int dim, int spacedim> -void GridOut::write_svg (const Triangulation<dim,spacedim> &tria, +void GridOut::write_svg (const Triangulation<dim,spacedim> &, std::ostream &/*out*/) const { Assert(false, ExcNotImplemented()); diff --git a/source/numerics/matrix_tools.cc b/source/numerics/matrix_tools.cc index a225524c57..ba96eb5799 100644 --- a/source/numerics/matrix_tools.cc +++ b/source/numerics/matrix_tools.cc @@ -867,7 +867,7 @@ namespace MatrixCreator template <int dim, int spacedim> void create_boundary_mass_matrix_1 (typename DoFHandler<dim,spacedim>::active_cell_iterator const &cell, - MatrixCreator::internal::AssemblerBoundary::Scratch const &scratch, + MatrixCreator::internal::AssemblerBoundary::Scratch const &, MatrixCreator::internal::AssemblerBoundary::CopyData<DoFHandler<dim, spacedim> > ©_data, Mapping<dim, spacedim> const &mapping, @@ -1135,14 +1135,13 @@ namespace MatrixCreator template <> void - MatrixCreator::internal::AssemblerBoundary::Scratch const - &scratch, create_boundary_mass_matrix_1<1,3> (DoFHandler<1,3>::active_cell_iterator const &/*cell*/, + MatrixCreator::internal::AssemblerBoundary::Scratch const &, MatrixCreator::internal::AssemblerBoundary::CopyData<DoFHandler<1, - Mapping<1,3> const &mapping, - FiniteElement<1,3> const &fe, - Quadrature<0> const &q, 3> > &/*copy_data*/, + Mapping<1,3> const &, + FiniteElement<1,3> const &, + Quadrature<0> const &, FunctionMap<3>::type const &/*boundary_functions*/, Function<3> const *const /*coefficient*/, std::vector<unsigned int> const &/*component_mapping*/) @@ -1231,7 +1230,7 @@ namespace MatrixCreator void create_hp_boundary_mass_matrix_1 (typename hp::DoFHandler<dim,spacedim>::active_cell_iterator const &cell, - MatrixCreator::internal::AssemblerBoundary::Scratch const &scratch, + MatrixCreator::internal::AssemblerBoundary::Scratch const &, MatrixCreator::internal::AssemblerBoundary ::CopyData<hp::DoFHandler<dim,spacedim> > ©_data, hp::MappingCollection<dim,spacedim> const &mapping, @@ -1704,7 +1703,7 @@ namespace MatrixCreator const Quadrature<dim> &q, SparseMatrix<double> &matrix, const Function<spacedim> *const coefficient, - const ConstraintMatrix &constraints) + const ConstraintMatrix &) { create_laplace_matrix(StaticMappingQ1<dim,spacedim>::mapping, dof, q, matrix, coefficient); } @@ -1763,7 +1762,7 @@ namespace MatrixCreator const Function<spacedim> &rhs, Vector<double> &rhs_vector, const Function<spacedim> *const coefficient, - const ConstraintMatrix &constraints) + const ConstraintMatrix &) { create_laplace_matrix(StaticMappingQ1<dim,spacedim>::mapping, dof, q, matrix, rhs, rhs_vector, coefficient); @@ -1816,7 +1815,7 @@ namespace MatrixCreator const hp::QCollection<dim> &q, SparseMatrix<double> &matrix, const Function<spacedim> *const coefficient, - const ConstraintMatrix &constraints) + const ConstraintMatrix &) { create_laplace_matrix(hp::StaticMappingQ1<dim,spacedim>::mapping_collection, dof, q, matrix, coefficient); } @@ -1872,7 +1871,7 @@ namespace MatrixCreator const Function<spacedim> &rhs, Vector<double> &rhs_vector, const Function<spacedim> *const coefficient, - const ConstraintMatrix &constraints) + const ConstraintMatrix &) { create_laplace_matrix(hp::StaticMappingQ1<dim,spacedim>::mapping_collection, dof, q, matrix, rhs, rhs_vector, coefficient); -- 2.39.5