]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Do not use initializer lists in delegating constructors. 3212/head
authorWolfgang Bangerth <bangerth@colostate.edu>
Thu, 6 Oct 2016 13:52:40 +0000 (07:52 -0600)
committerWolfgang Bangerth <bangerth@colostate.edu>
Thu, 6 Oct 2016 13:52:40 +0000 (07:52 -0600)
This apparently confuses compilers that claim that they can do C++11 but
really can't.

source/fe/fe_enriched.cc

index 4ba7ebfe8869ffd41287c354c7f9f5f56292dc4e..405a39d3a8b60777e98bce6a2d75058ea240a696 100644 (file)
@@ -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>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.