From fc014c6bf09879383015f832c8fd745925981891 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 10 May 2019 06:51:44 +0200 Subject: [PATCH] Fix clang-4 warnings --- examples/step-24/step-24.cc | 10 +++++----- examples/step-53/step-53.cc | 6 +++--- source/distributed/cell_weights.cc | 8 +++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/examples/step-24/step-24.cc b/examples/step-24/step-24.cc index 7a29714488..daceb1ae3e 100644 --- a/examples/step-24/step-24.cc +++ b/examples/step-24/step-24.cc @@ -143,11 +143,11 @@ namespace Step24 const unsigned int /*component*/ = 0) const override { static const std::array sources{ - Source(Point(0, 0), 0.025), - Source(Point(-0.135, 0), 0.05), - Source(Point(0.17, 0), 0.03), - Source(Point(-0.25, 0), 0.02), - Source(Point(-0.05, -0.15), 0.015)}; + {Source(Point(0, 0), 0.025), + Source(Point(-0.135, 0), 0.05), + Source(Point(0.17, 0), 0.03), + Source(Point(-0.25, 0), 0.02), + Source(Point(-0.05, -0.15), 0.015)}}; for (const auto &source : sources) if (p.distance(source.location) < source.radius) diff --git a/examples/step-53/step-53.cc b/examples/step-53/step-53.cc index b76e510810..f26f2408d5 100644 --- a/examples/step-53/step-53.cc +++ b/examples/step-53/step-53.cc @@ -110,9 +110,9 @@ namespace Step53 // access any member variables of the class, and (ii) because they are // called at a time when the object is not initialized fully anyway. AfricaTopography::AfricaTopography() - : topography_data({std::make_pair(-6.983333, 11.966667), - std::make_pair(25, 35.95)}, - {379, 219}, + : topography_data({{std::make_pair(-6.983333, 11.966667), + std::make_pair(25, 35.95)}}, + {{379, 219}}, Table<2, double>(380, 220, get_data().begin())) {} diff --git a/source/distributed/cell_weights.cc b/source/distributed/cell_weights.cc index 4e9f9989ad..d8c18121e4 100644 --- a/source/distributed/cell_weights.cc +++ b/source/distributed/cell_weights.cc @@ -149,11 +149,9 @@ namespace parallel fe_indices_children.insert( cell->child(child_index)->active_fe_index()); - unsigned int fe_index = - dof_handler->get_fe_collection().find_dominating_fe_extended( - fe_indices_children, /*codim=*/0); - - Assert(fe_index != numbers::invalid_unsigned_int, + Assert(dof_handler->get_fe_collection().find_dominating_fe_extended( + fe_indices_children, /*codim=*/0) != + numbers::invalid_unsigned_int, ExcMessage( "No FiniteElement has been found in your FECollection " "that dominates all children of a cell you are trying " -- 2.39.5