From: Niklas Fehn <fehn@lnm.mw.tum.de>
Date: Wed, 18 Mar 2020 08:00:55 +0000 (+0100)
Subject: change declarations
X-Git-Tag: v9.2.0-rc1~403^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1da2ac03c328a32f6fe77e17c0dc9cfbee1eb39;p=dealii.git

change declarations
---

diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h
index a9cf8ac42c..c9e9dd6974 100644
--- a/include/deal.II/grid/grid_generator.h
+++ b/include/deal.II/grid/grid_generator.h
@@ -1547,11 +1547,10 @@ namespace GridGenerator
   template <int dim, int spacedim>
   void
   merge_triangulations(
-    const std::initializer_list<const Triangulation<dim, spacedim> *const>
-      &                           triangulations,
-    Triangulation<dim, spacedim> &result,
-    const double                  duplicated_vertex_tolerance = 1.0e-12,
-    const bool                    copy_manifold_ids           = false);
+    const std::vector<const Triangulation<dim, spacedim> *> &triangulations,
+    Triangulation<dim, spacedim> &                           result,
+    const double duplicated_vertex_tolerance = 1.0e-12,
+    const bool   copy_manifold_ids           = false);
 
   /**
    * \brief Replicate a given triangulation in multiple coordinate axes
diff --git a/source/grid/grid_generator.inst.in b/source/grid/grid_generator.inst.in
index 0e6c15512d..d350c01c4e 100644
--- a/source/grid/grid_generator.inst.in
+++ b/source/grid/grid_generator.inst.in
@@ -80,9 +80,8 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
 
       template void
       merge_triangulations(
-        const std::initializer_list<
-          const Triangulation<deal_II_dimension, deal_II_space_dimension>
-            *const> &,
+        const std::vector<
+          const Triangulation<deal_II_dimension, deal_II_space_dimension> *> &,
         Triangulation<deal_II_dimension, deal_II_space_dimension> &,
         const double,
         const bool);