]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Try to trick MSVC into accepting a default argument. 11604/head
authorWolfgang Bangerth <bangerth@colostate.edu>
Mon, 25 Jan 2021 04:49:07 +0000 (21:49 -0700)
committerWolfgang Bangerth <bangerth@colostate.edu>
Thu, 28 Jan 2021 00:32:00 +0000 (17:32 -0700)
include/deal.II/grid/grid_tools.h
include/deal.II/grid/grid_tools_cache.h
include/deal.II/numerics/vector_tools_constraints.h
include/deal.II/particles/generators.h

index 8985886aac81d02ed6a4229fd1248552ec3fe4c9..91e58004bb517c549719d0a2962ce9c4b4fc6439 100644 (file)
@@ -176,8 +176,8 @@ namespace GridTools
   double
   volume(const Triangulation<dim, spacedim> &tria,
          const Mapping<dim, spacedim> &      mapping =
-           ReferenceCell::Type::get_hypercube<dim>()
-             .template get_default_linear_mapping<dim, spacedim>());
+           (ReferenceCell::Type::get_hypercube<dim>()
+              .template get_default_linear_mapping<dim, spacedim>()));
 
   /**
    * Return an approximation of the diameter of the smallest active cell of a
@@ -194,8 +194,8 @@ namespace GridTools
   minimal_cell_diameter(
     const Triangulation<dim, spacedim> &triangulation,
     const Mapping<dim, spacedim> &      mapping =
-      ReferenceCell::Type::get_hypercube<dim>()
-        .template get_default_linear_mapping<dim, spacedim>());
+      (ReferenceCell::Type::get_hypercube<dim>()
+         .template get_default_linear_mapping<dim, spacedim>()));
 
   /**
    * Return an approximation of the diameter of the largest active cell of a
@@ -212,8 +212,8 @@ namespace GridTools
   maximal_cell_diameter(
     const Triangulation<dim, spacedim> &triangulation,
     const Mapping<dim, spacedim> &      mapping =
-      ReferenceCell::Type::get_hypercube<dim>()
-        .template get_default_linear_mapping<dim, spacedim>());
+      (ReferenceCell::Type::get_hypercube<dim>()
+         .template get_default_linear_mapping<dim, spacedim>()));
 
   /**
    * Given a list of vertices (typically obtained using
@@ -1044,8 +1044,8 @@ namespace GridTools
   extract_used_vertices(
     const Triangulation<dim, spacedim> &container,
     const Mapping<dim, spacedim> &      mapping =
-      ReferenceCell::Type::get_hypercube<dim>()
-        .template get_default_linear_mapping<dim, spacedim>());
+      (ReferenceCell::Type::get_hypercube<dim>()
+         .template get_default_linear_mapping<dim, spacedim>()));
 
   /**
    * Find and return the index of the closest vertex to a given point in the
@@ -1872,8 +1872,8 @@ namespace GridTools
     const typename Triangulation<dim, spacedim>::active_cell_iterator &cell,
     const Point<spacedim> &                                            position,
     const Mapping<dim, spacedim> &                                     mapping =
-      ReferenceCell::Type::get_hypercube<dim>()
-        .template get_default_linear_mapping<dim, spacedim>());
+      (ReferenceCell::Type::get_hypercube<dim>()
+         .template get_default_linear_mapping<dim, spacedim>()));
 
   /**
    * Compute a globally unique index for each vertex and hanging node
index a5b48a8371ab9f45baae1148ed485a902264a5cc..5ced504c700f42beaf69e96bab0663c41e63097c 100644 (file)
@@ -76,8 +76,8 @@ namespace GridTools
      */
     Cache(const Triangulation<dim, spacedim> &tria,
           const Mapping<dim, spacedim> &      mapping =
-            ReferenceCell::Type::get_hypercube<dim>()
-              .template get_default_linear_mapping<dim, spacedim>());
+            (ReferenceCell::Type::get_hypercube<dim>()
+               .template get_default_linear_mapping<dim, spacedim>()));
 
     /**
      * Destructor.
index b4e5c5a61ff1f4b2bcdbd7b5ee44fd42b84a59fb..214d23b479c3ef30d471ec048dc5422bef9b4e66 100644 (file)
@@ -280,8 +280,8 @@ namespace VectorTools
       &                           function_map,
     AffineConstraints<double> &   constraints,
     const Mapping<dim, spacedim> &mapping =
-      ReferenceCell::Type::get_hypercube<dim>()
-        .template get_default_linear_mapping<dim, spacedim>());
+      (ReferenceCell::Type::get_hypercube<dim>()
+         .template get_default_linear_mapping<dim, spacedim>()));
 
   /**
    * This function does the same as the
@@ -303,8 +303,8 @@ namespace VectorTools
     const std::set<types::boundary_id> &boundary_ids,
     AffineConstraints<double> &         constraints,
     const Mapping<dim, spacedim> &      mapping =
-      ReferenceCell::Type::get_hypercube<dim>()
-        .template get_default_linear_mapping<dim, spacedim>());
+      (ReferenceCell::Type::get_hypercube<dim>()
+         .template get_default_linear_mapping<dim, spacedim>()));
 
   /**
    * Compute the constraints that correspond to boundary conditions of the
@@ -332,8 +332,8 @@ namespace VectorTools
       &                           function_map,
     AffineConstraints<double> &   constraints,
     const Mapping<dim, spacedim> &mapping =
-      ReferenceCell::Type::get_hypercube<dim>()
-        .template get_default_linear_mapping<dim, spacedim>());
+      (ReferenceCell::Type::get_hypercube<dim>()
+         .template get_default_linear_mapping<dim, spacedim>()));
 
   /**
    * Same as above for homogeneous tangential-flux constraints.
@@ -351,8 +351,8 @@ namespace VectorTools
     const std::set<types::boundary_id> &boundary_ids,
     AffineConstraints<double> &         constraints,
     const Mapping<dim, spacedim> &      mapping =
-      ReferenceCell::Type::get_hypercube<dim>()
-        .template get_default_linear_mapping<dim, spacedim>());
+      (ReferenceCell::Type::get_hypercube<dim>()
+         .template get_default_linear_mapping<dim, spacedim>()));
 
   //@}
 } // namespace VectorTools
index 46ef1118b6590ec118a080b4fe9004a64dba5a4e..c0ef6ebaf66f104b12d6c43f8aff558985f2a9d7 100644 (file)
@@ -69,8 +69,8 @@ namespace Particles
       const std::vector<Point<dim>> &     particle_reference_locations,
       ParticleHandler<dim, spacedim> &    particle_handler,
       const Mapping<dim, spacedim> &      mapping =
-        ReferenceCell::Type::get_hypercube<dim>()
-          .template get_default_linear_mapping<dim, spacedim>());
+        (ReferenceCell::Type::get_hypercube<dim>()
+           .template get_default_linear_mapping<dim, spacedim>()));
 
     /**
      * A function that generates one particle at a random location in cell @p cell and with
@@ -108,8 +108,8 @@ namespace Particles
       const types::particle_index                                        id,
       std::mt19937 &                random_number_generator,
       const Mapping<dim, spacedim> &mapping =
-        ReferenceCell::Type::get_hypercube<dim>()
-          .template get_default_linear_mapping<dim, spacedim>());
+        (ReferenceCell::Type::get_hypercube<dim>()
+           .template get_default_linear_mapping<dim, spacedim>()));
 
     /**
      * A function that generates particles randomly in the domain with a
@@ -164,8 +164,8 @@ namespace Particles
       const types::particle_index         n_particles_to_create,
       ParticleHandler<dim, spacedim> &    particle_handler,
       const Mapping<dim, spacedim> &      mapping =
-        ReferenceCell::Type::get_hypercube<dim>()
-          .template get_default_linear_mapping<dim, spacedim>(),
+        (ReferenceCell::Type::get_hypercube<dim>()
+           .template get_default_linear_mapping<dim, spacedim>()),
       const unsigned int random_number_seed = 5432);
 
 
@@ -211,8 +211,8 @@ namespace Particles
         &                             global_bounding_boxes,
       ParticleHandler<dim, spacedim> &particle_handler,
       const Mapping<dim, spacedim> &  mapping =
-        ReferenceCell::Type::get_hypercube<dim>()
-          .template get_default_linear_mapping<dim, spacedim>(),
+        (ReferenceCell::Type::get_hypercube<dim>()
+           .template get_default_linear_mapping<dim, spacedim>()),
       const ComponentMask &                   components = ComponentMask(),
       const std::vector<std::vector<double>> &properties = {});
 
@@ -249,15 +249,16 @@ namespace Particles
      */
     template <int dim, int spacedim = dim>
     void
-    quadrature_points(const Triangulation<dim, spacedim> &triangulation,
-                      const Quadrature<dim> &             quadrature,
-                      const std::vector<std::vector<BoundingBox<spacedim>>>
-                        &                             global_bounding_boxes,
-                      ParticleHandler<dim, spacedim> &particle_handler,
-                      const Mapping<dim, spacedim> &  mapping =
-                        ReferenceCell::Type::get_hypercube<dim>()
-                          .template get_default_linear_mapping<dim, spacedim>(),
-                      const std::vector<std::vector<double>> &properties = {});
+    quadrature_points(
+      const Triangulation<dim, spacedim> &triangulation,
+      const Quadrature<dim> &             quadrature,
+      const std::vector<std::vector<BoundingBox<spacedim>>>
+        &                             global_bounding_boxes,
+      ParticleHandler<dim, spacedim> &particle_handler,
+      const Mapping<dim, spacedim> &  mapping =
+        (ReferenceCell::Type::get_hypercube<dim>()
+           .template get_default_linear_mapping<dim, spacedim>()),
+      const std::vector<std::vector<double>> &properties = {});
   } // namespace Generators
 } // namespace Particles
 

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.