From 3cffc4c777e08dc6bf82a4dff53eb2e38107b992 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 7 Apr 2020 12:28:41 -0400 Subject: [PATCH] Fix some warnings in tests with clang-10 --- tests/base/mpi_noncontiguous_partitioner_02.cc | 2 +- tests/base/transpose_table_iterators_1.cc | 2 +- tests/data_out/data_out_12.cc | 2 +- tests/data_out/data_out_13.cc | 2 +- ...intergrid_transfer_representation_parallel.cc | 2 +- tests/grid/mesh_3d_17.cc | 3 ++- tests/grid/user_data_01.cc | 8 ++++---- tests/matrix_free/iterators.cc | 2 +- tests/matrix_free/mapping_info_01.cc | 16 ++++++++-------- tests/mpi/parallel_partitioner_09.cc | 6 +++--- tests/numerics/project_bv_curl_conf_04.cc | 2 +- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tests/base/mpi_noncontiguous_partitioner_02.cc b/tests/base/mpi_noncontiguous_partitioner_02.cc index 0e00e1c868..d419bd6974 100644 --- a/tests/base/mpi_noncontiguous_partitioner_02.cc +++ b/tests/base/mpi_noncontiguous_partitioner_02.cc @@ -81,7 +81,7 @@ test(const MPI_Comm &comm, const bool do_revert, const unsigned int dir) for (unsigned int i = 0; i < dim; i++) c[i] = c[i] / delta; - const unsigned int lid = norm_point_to_lex(c); + const auto lid = static_cast(norm_point_to_lex(c)); for (unsigned int i = lid * n_points_cell; i < (lid + 1) * n_points_cell; diff --git a/tests/base/transpose_table_iterators_1.cc b/tests/base/transpose_table_iterators_1.cc index 7f59b0dda2..661483ee04 100644 --- a/tests/base/transpose_table_iterators_1.cc +++ b/tests/base/transpose_table_iterators_1.cc @@ -31,7 +31,7 @@ main() // test a non-empty rectangular table TransposeTable table(3, 4); std::iota(table.begin(), table.end(), 1.0); - for (const auto entry : table) + for (const auto &entry : table) { deallog << entry.row() << ", " << entry.column() << ", " << entry.value() << std::endl; diff --git a/tests/data_out/data_out_12.cc b/tests/data_out/data_out_12.cc index ff36bcbdda..59a8f5aa7a 100644 --- a/tests/data_out/data_out_12.cc +++ b/tests/data_out/data_out_12.cc @@ -132,7 +132,7 @@ check() { // find matching location unsigned int p = 0; - for (const auto c : coords) + for (const auto &c : coords) { Point point; for (unsigned int d = 0; d < dim; ++d) diff --git a/tests/data_out/data_out_13.cc b/tests/data_out/data_out_13.cc index 42a5390425..0af98f7e3e 100644 --- a/tests/data_out/data_out_13.cc +++ b/tests/data_out/data_out_13.cc @@ -132,7 +132,7 @@ check() { // find matching location unsigned int p = 0; - for (const auto c : coords) + for (const auto &c : coords) { Point point; for (unsigned int d = 0; d < dim; ++d) diff --git a/tests/distributed_grids/intergrid_transfer_representation_parallel.cc b/tests/distributed_grids/intergrid_transfer_representation_parallel.cc index e9f05f423d..d102b9390d 100644 --- a/tests/distributed_grids/intergrid_transfer_representation_parallel.cc +++ b/tests/distributed_grids/intergrid_transfer_representation_parallel.cc @@ -103,7 +103,7 @@ test(unsigned n_refinements) for (TransferRep::value_type::const_iterator it = m.begin(); it != m.end(); ++it) - local_sum += it->second; + local_sum += static_cast(it->second); } unsigned global_sum = Utilities::MPI::sum(local_sum, MPI_COMM_WORLD); diff --git a/tests/grid/mesh_3d_17.cc b/tests/grid/mesh_3d_17.cc index d901cb5cd3..22a830b898 100644 --- a/tests/grid/mesh_3d_17.cc +++ b/tests/grid/mesh_3d_17.cc @@ -111,7 +111,8 @@ void check(Triangulation<3> &tria) // we used to abort in the // following call, due to a // wrong Assert condition: - cell->neighbor_child_on_subface(face_no, subface_no); + auto dummy = + cell->neighbor_child_on_subface(face_no, subface_no); } } } diff --git a/tests/grid/user_data_01.cc b/tests/grid/user_data_01.cc index 9609bbb8bc..4b9443a620 100644 --- a/tests/grid/user_data_01.cc +++ b/tests/grid/user_data_01.cc @@ -179,11 +179,11 @@ user_pointers(Triangulation &tr) // Create two pointer index clashes here try { - tr.begin()->user_index(); + auto dummy = tr.begin()->user_index(); } catch (...) {} - tr.begin()->user_pointer(); + auto dummy = tr.begin()->user_pointer(); // Check if save and load work @@ -259,13 +259,13 @@ user_indices(Triangulation &tr) // Create two pointer index clashes here try { - tr.begin()->user_pointer(); + auto dummy = tr.begin()->user_pointer(); } catch (ExceptionBase &e) { deallog << e.get_exc_name() << std::endl; } - tr.begin()->user_index(); + auto dummy = tr.begin()->user_index(); diff --git a/tests/matrix_free/iterators.cc b/tests/matrix_free/iterators.cc index c951ae903f..ad48a129c7 100644 --- a/tests/matrix_free/iterators.cc +++ b/tests/matrix_free/iterators.cc @@ -105,7 +105,7 @@ public: for (const auto cell : cells) deallog << "cell: " << cell.to_string() << std::endl; - for (const auto face : faces) + for (const auto &face : faces) deallog << "face: " << face.first.to_string() << " " << face.second.to_string() << std::endl; diff --git a/tests/matrix_free/mapping_info_01.cc b/tests/matrix_free/mapping_info_01.cc index 1afa066ca7..5675b98050 100644 --- a/tests/matrix_free/mapping_info_01.cc +++ b/tests/matrix_free/mapping_info_01.cc @@ -55,14 +55,14 @@ test(const unsigned int degree) data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit( - mapping, - std::vector *>({{&dof}}), - std::vector *>({{&constraints}}), - std::vector>({{QGauss<1>(std::max(degree / 2, 1U)), - QGauss<1>(degree + 1), - QGauss<1>(3 * degree / 2)}}), - data); + mf_data.reinit(mapping, + std::vector *>{&dof}, + std::vector *>{&constraints}, + std::vector>{ + {QGauss<1>(std::max(degree / 2, 1U)), + QGauss<1>(degree + 1), + QGauss<1>(3 * degree / 2)}}, + data); deallog << std::setw(5) << degree; for (unsigned int index = 0; index < 3; ++index) diff --git a/tests/mpi/parallel_partitioner_09.cc b/tests/mpi/parallel_partitioner_09.cc index a7ff3676c1..9606009b5f 100644 --- a/tests/mpi/parallel_partitioner_09.cc +++ b/tests/mpi/parallel_partitioner_09.cc @@ -38,15 +38,15 @@ main(int argc, char **argv) Utilities::MPI::Partitioner part(owned, ghosted, MPI_COMM_WORLD); deallog << "ghost targets: "; - for (const auto p : part.ghost_targets()) + for (const auto &p : part.ghost_targets()) deallog << "p" << p.first << " n_indices=" << p.second << " "; deallog << std::endl; deallog << "import targets: "; - for (const auto p : part.import_targets()) + for (const auto &p : part.import_targets()) deallog << "p" << p.first << " n_indices=" << p.second << " "; deallog << std::endl; deallog << "import indices: "; - for (const auto p : part.import_indices()) + for (const auto &p : part.import_indices()) deallog << "[" << p.first << " " << p.second << ") "; deallog << std::endl; } diff --git a/tests/numerics/project_bv_curl_conf_04.cc b/tests/numerics/project_bv_curl_conf_04.cc index 559ce11db9..1e358b45c6 100644 --- a/tests/numerics/project_bv_curl_conf_04.cc +++ b/tests/numerics/project_bv_curl_conf_04.cc @@ -69,7 +69,6 @@ test_boundary_values(DoFHandler & dof_handler, unsigned int start_comp, Vector & vec) { - double ret = true; // Initialize QGaussLobatto quadrature(3); FEFaceValues fe_values(mapping, @@ -138,6 +137,7 @@ test_boundary_values(DoFHandler & dof_handler, num_cells++; } // Test if ok + bool ret = true; for (unsigned int bc = 0; bc < 6; ++bc) { for (unsigned int basis = 0; basis < dof_handler.n_dofs(); basis++) -- 2.39.5