From: Wolfgang Bangerth Date: Mon, 25 Jan 2021 04:49:07 +0000 (-0700) Subject: Try to trick MSVC into accepting a default argument. X-Git-Tag: v9.3.0-rc1~556^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6491133d1ce5183ee58b76ecc8bc383c907a3866;p=dealii.git Try to trick MSVC into accepting a default argument. --- diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h index 8985886aac..91e58004bb 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -176,8 +176,8 @@ namespace GridTools double volume(const Triangulation &tria, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * Return an approximation of the diameter of the smallest active cell of a @@ -194,8 +194,8 @@ namespace GridTools minimal_cell_diameter( const Triangulation &triangulation, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * Return an approximation of the diameter of the largest active cell of a @@ -212,8 +212,8 @@ namespace GridTools maximal_cell_diameter( const Triangulation &triangulation, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * Given a list of vertices (typically obtained using @@ -1044,8 +1044,8 @@ namespace GridTools extract_used_vertices( const Triangulation &container, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * Find and return the index of the closest vertex to a given point in the @@ -1872,8 +1872,8 @@ namespace GridTools const typename Triangulation::active_cell_iterator &cell, const Point & position, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * Compute a globally unique index for each vertex and hanging node diff --git a/include/deal.II/grid/grid_tools_cache.h b/include/deal.II/grid/grid_tools_cache.h index a5b48a8371..5ced504c70 100644 --- a/include/deal.II/grid/grid_tools_cache.h +++ b/include/deal.II/grid/grid_tools_cache.h @@ -76,8 +76,8 @@ namespace GridTools */ Cache(const Triangulation &tria, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * Destructor. diff --git a/include/deal.II/numerics/vector_tools_constraints.h b/include/deal.II/numerics/vector_tools_constraints.h index b4e5c5a61f..214d23b479 100644 --- a/include/deal.II/numerics/vector_tools_constraints.h +++ b/include/deal.II/numerics/vector_tools_constraints.h @@ -280,8 +280,8 @@ namespace VectorTools & function_map, AffineConstraints & constraints, const Mapping &mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * This function does the same as the @@ -303,8 +303,8 @@ namespace VectorTools const std::set &boundary_ids, AffineConstraints & constraints, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * Compute the constraints that correspond to boundary conditions of the @@ -332,8 +332,8 @@ namespace VectorTools & function_map, AffineConstraints & constraints, const Mapping &mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * Same as above for homogeneous tangential-flux constraints. @@ -351,8 +351,8 @@ namespace VectorTools const std::set &boundary_ids, AffineConstraints & constraints, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); //@} } // namespace VectorTools diff --git a/include/deal.II/particles/generators.h b/include/deal.II/particles/generators.h index 46ef1118b6..c0ef6ebaf6 100644 --- a/include/deal.II/particles/generators.h +++ b/include/deal.II/particles/generators.h @@ -69,8 +69,8 @@ namespace Particles const std::vector> & particle_reference_locations, ParticleHandler & particle_handler, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * 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 &mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping()); + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping())); /** * 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 & particle_handler, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping(), + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping()), const unsigned int random_number_seed = 5432); @@ -211,8 +211,8 @@ namespace Particles & global_bounding_boxes, ParticleHandler &particle_handler, const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping(), + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping()), const ComponentMask & components = ComponentMask(), const std::vector> &properties = {}); @@ -249,15 +249,16 @@ namespace Particles */ template void - quadrature_points(const Triangulation &triangulation, - const Quadrature & quadrature, - const std::vector>> - & global_bounding_boxes, - ParticleHandler &particle_handler, - const Mapping & mapping = - ReferenceCell::Type::get_hypercube() - .template get_default_linear_mapping(), - const std::vector> &properties = {}); + quadrature_points( + const Triangulation &triangulation, + const Quadrature & quadrature, + const std::vector>> + & global_bounding_boxes, + ParticleHandler &particle_handler, + const Mapping & mapping = + (ReferenceCell::Type::get_hypercube() + .template get_default_linear_mapping()), + const std::vector> &properties = {}); } // namespace Generators } // namespace Particles