From: Wolfgang Bangerth <bangerth@colostate.edu>
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=212601c69b19b0a229d34d293c1c89df48693ce7;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 <deal.II/fe/fe_enriched.h>
 
 #ifdef DEAL_II_WITH_CXX14
@@ -127,17 +129,19 @@ FE_Enriched<dim,spacedim>::FE_Enriched (const FiniteElement<dim,spacedim> &fe_ba
                                         const Function<spacedim>      *enrichment_function)
   :
   FE_Enriched<dim,spacedim>
-  (&fe_base, { &fe_enriched },
+  (&fe_base,
+   std::vector<const FiniteElement<dim,spacedim>*>(1, &fe_enriched),
+   std::vector<std::vector<std::function<const Function<spacedim> *(const typename Triangulation<dim, spacedim>::cell_iterator &) > > >
+   (1,
+    std::vector<std::function<const Function<spacedim> *(const typename Triangulation<dim, spacedim>::cell_iterator &) > >
+    (1,
+     [=] (const typename Triangulation<dim, spacedim>::cell_iterator &) -> const Function<spacedim> *
 {
-  {
-    [=] (const typename Triangulation<dim, spacedim>::cell_iterator &) -> const Function<spacedim> *
-    {
-      return enrichment_function;
-    }
-  }
+  return enrichment_function;
 })
-{
-}
+ )
+)
+{}
 
 
 template <int dim, int spacedim>
@@ -148,8 +152,7 @@ FE_Enriched<dim,spacedim>::FE_Enriched (const FiniteElement<dim,spacedim> *fe_ba
   FE_Enriched<dim,spacedim> (build_fes(fe_base,fe_enriched),
                              build_multiplicities(functions),
                              functions)
-{
-}
+{}
 
 
 template <int dim, int spacedim>