]> https://gitweb.dealii.org/ - dealii.git/commitdiff
merge_triangulations(): replace std::initializer_list by std::vector
authorNiklas Fehn <fehn@lnm.mw.tum.de>
Wed, 18 Mar 2020 07:33:04 +0000 (08:33 +0100)
committerNiklas Fehn <fehn@lnm.mw.tum.de>
Wed, 18 Mar 2020 07:33:04 +0000 (08:33 +0100)
source/grid/grid_generator.cc

index ca7eaed28591d2d43637d1b49e86f8ed0091adc9..67d47f7d850e2bf7e896af4e80b9c16dc646aa07 100644 (file)
@@ -5726,11 +5726,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,
-    const bool                    copy_manifold_ids)
+    const std::vector<const Triangulation<dim, spacedim> *> &triangulations,
+    Triangulation<dim, spacedim> &                           result,
+    const double duplicated_vertex_tolerance,
+    const bool   copy_manifold_ids)
   {
     std::vector<Point<spacedim>> vertices;
     std::vector<CellData<dim>>   cells;

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.