From 0d3ac6b15446a20908c4d670fce571fb5e6404ed Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Wed, 23 Sep 2020 13:24:34 +0200 Subject: [PATCH] Work on warning --- .../deal.II/matrix_free/evaluation_kernels.h | 11 +++++----- include/deal.II/matrix_free/fe_evaluation.h | 21 +++++++------------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/include/deal.II/matrix_free/evaluation_kernels.h b/include/deal.II/matrix_free/evaluation_kernels.h index 7877ae06b4..a30377f1e8 100644 --- a/include/deal.II/matrix_free/evaluation_kernels.h +++ b/include/deal.II/matrix_free/evaluation_kernels.h @@ -2586,8 +2586,7 @@ namespace internal const unsigned int dummy = 0; // re-orientation - std::array orientation; - std::fill(orientation.begin(), orientation.end(), nullptr); + std::array orientation = {}; if (n_face_orientations == 1) orientation[0] = (data.data.front().nodal_at_cell_boundaries == true) ? @@ -2611,8 +2610,8 @@ namespace internal } // face_to_cell_index_hermite - std::array index_array_hermite; - std::fill(index_array_hermite.begin(), index_array_hermite.end(), nullptr); + std::array index_array_hermite = + {}; if (n_face_orientations == 1) index_array_hermite[0] = @@ -2641,8 +2640,8 @@ namespace internal } // face_to_cell_index_nodal - std::array index_array_nodal; - std::fill(index_array_nodal.begin(), index_array_nodal.end(), nullptr); + std::array index_array_nodal = + {}; if (n_face_orientations == 1) index_array_nodal[0] = diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index 049c8c9cf9..6ca84eb940 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -8496,13 +8496,10 @@ FEFaceEvaluation cells_; - std::array face_no_; - std::array face_orientation_; - - std::fill(cells_.begin(), cells_.end(), -1); - std::fill(face_no_.begin(), face_no_.end(), -1); - std::fill(face_orientation_.begin(), face_orientation_.end(), -1); + std::array cells_ = {}; + std::array face_no_ = {}; + std::array + face_orientation_ = {}; cells_[0] = this->cell; face_no_[0] = this->face_no; @@ -8629,13 +8626,9 @@ FEFaceEvaluation cells_; - std::array face_no_; - std::array face_orientation_; - - std::fill(cells_.begin(), cells_.end(), -1); - std::fill(face_no_.begin(), face_no_.end(), -1); - std::fill(face_orientation_.begin(), face_orientation_.end(), -1); + std::array cells_ = {}; + std::array face_no_ = {}; + std::array face_orientation_ = {}; cells_[0] = this->cell; face_no_[0] = this->face_no; -- 2.39.5