From: Wolfgang Bangerth Date: Thu, 6 Oct 2016 13:52:40 +0000 (-0600) Subject: Do not use initializer lists in delegating constructors. X-Git-Tag: v8.5.0-rc1~586^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3212%2Fhead;p=dealii.git Do not use initializer lists in delegating constructors. This apparently confuses compilers that claim that they can do C++11 but really can't. --- diff --git a/source/fe/fe_enriched.cc b/source/fe/fe_enriched.cc index 4ba7ebfe88..405a39d3a8 100644 --- a/source/fe/fe_enriched.cc +++ b/source/fe/fe_enriched.cc @@ -12,6 +12,8 @@ // the top level of the deal.II distribution. // // --------------------------------------------------------------------- + + #include #ifdef DEAL_II_WITH_CXX14 @@ -127,17 +129,19 @@ FE_Enriched::FE_Enriched (const FiniteElement &fe_ba const Function *enrichment_function) : FE_Enriched - (&fe_base, { &fe_enriched }, + (&fe_base, + std::vector*>(1, &fe_enriched), + std::vector *(const typename Triangulation::cell_iterator &) > > > + (1, + std::vector *(const typename Triangulation::cell_iterator &) > > + (1, + [=] (const typename Triangulation::cell_iterator &) -> const Function * { - { - [=] (const typename Triangulation::cell_iterator &) -> const Function * - { - return enrichment_function; - } - } + return enrichment_function; }) -{ -} + ) +) +{} template @@ -148,8 +152,7 @@ FE_Enriched::FE_Enriched (const FiniteElement *fe_ba FE_Enriched (build_fes(fe_base,fe_enriched), build_multiplicities(functions), functions) -{ -} +{} template