From 882f3a149adaee8b3c896acbd8be3df22554b192 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 18 Sep 2019 20:41:45 -0600 Subject: [PATCH] Unify style --- include/deal.II/base/patterns.h | 2 +- include/deal.II/hp/fe_collection.h | 4 ++-- include/deal.II/hp/q_collection.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h index 413781ec15..7527753ba1 100644 --- a/include/deal.II/base/patterns.h +++ b/include/deal.II/base/patterns.h @@ -1439,7 +1439,7 @@ namespace Patterns "are derived from PatternBase"); static_assert(sizeof...(ps) > 0, "The number of PatternTypes must be greater than zero!"); - const auto &pattern_pointers = {(static_cast(&ps))...}; + const auto pattern_pointers = {(static_cast(&ps))...}; for (const auto p : pattern_pointers) patterns.push_back(p->clone()); } diff --git a/include/deal.II/hp/fe_collection.h b/include/deal.II/hp/fe_collection.h index 613d9392ee..2f9978e007 100644 --- a/include/deal.II/hp/fe_collection.h +++ b/include/deal.II/hp/fe_collection.h @@ -834,8 +834,8 @@ namespace hp // loop over all of the given arguments and add the finite elements to // this collection. Inlining the definition of fe_pointers causes internal // compiler errors on GCC 7.1.1 so we define it separately: - const auto &fe_pointers = - std::initializer_list *>{&fes...}; + const auto fe_pointers = { + (static_cast *>(&fes))...}; for (const auto p : fe_pointers) push_back(*p); } diff --git a/include/deal.II/hp/q_collection.h b/include/deal.II/hp/q_collection.h index ecdc5d8384..0b5bd091d8 100644 --- a/include/deal.II/hp/q_collection.h +++ b/include/deal.II/hp/q_collection.h @@ -156,8 +156,8 @@ namespace hp // loop over all of the given arguments and add the quadrature objects to // this collection. Inlining the definition of q_pointers causes internal // compiler errors on GCC 7.1.1 so we define it separately: - const auto &q_pointers = - std::initializer_list *>{&quadrature_objects...}; + const auto q_pointers = { + (static_cast *>(&quadrature_objects))...}; for (const auto p : q_pointers) push_back(*p); } -- 2.39.5