From 6bbca10ecc05d99a415d8b412d3243d0e1e4534e Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sat, 11 May 2019 21:33:53 +0200 Subject: [PATCH] Homogenise template parameter names in make_substitution_map() and add_to_substitution_map() --- .../sd/symengine_scalar_operations.h | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/include/deal.II/differentiation/sd/symengine_scalar_operations.h b/include/deal.II/differentiation/sd/symengine_scalar_operations.h index 5407745c39..668db12fa8 100644 --- a/include/deal.II/differentiation/sd/symengine_scalar_operations.h +++ b/include/deal.II/differentiation/sd/symengine_scalar_operations.h @@ -741,10 +741,10 @@ namespace Differentiation * @ref make_substitution_map(const Expression &,const ValueType &) * function. */ - template + template types::substitution_map make_substitution_map( - const std::pair &symbol_value, + const std::pair &symbol_value, const Args &... other_symbol_values); //@} @@ -942,7 +942,7 @@ namespace Differentiation * expression, and that the paired @p symbol_value elements are compatible * with the other add_to_substitution_map() functions. * - * The @p SymbolicType and its associated @ValueType need not be scalar + * The @p ExpressionType and its associated @ValueType need not be scalar * types. So, for example, this function could be used to add tensor-valued * data to the map in the following way: * @@ -965,12 +965,12 @@ namespace Differentiation * discussion on the role of this template argument. */ template void add_to_substitution_map( - types::substitution_map & substitution_map, - const std::pair &symbol_value); + types::substitution_map & substitution_map, + const std::pair &symbol_value); /** * A convenience function for adding multiple entries to the @@ -980,7 +980,7 @@ namespace Differentiation * symbolic expressions, and that the paired @p symbol_value elements are * compatible with the other add_to_substitution_map() functions. * - * The @p SymbolicType and its associated @ValueType need not be scalar + * The @p ExpressionType and its associated @ValueType need not be scalar * types. So, for example, this function could be used to add tensor-valued * data to the map in the following way: * @@ -1007,12 +1007,12 @@ namespace Differentiation * discussion on the role of this template argument. */ template void add_to_substitution_map( - types::substitution_map & substitution_map, - const std::vector> &symbol_values); + types::substitution_map & substitution_map, + const std::vector> &symbol_values); /** * A convenience function for adding multiple entries to the @@ -1045,13 +1045,13 @@ namespace Differentiation * function. */ template void add_to_substitution_map( - types::substitution_map & substitution_map, - const std::pair &symbol_value, + types::substitution_map & substitution_map, + const std::pair &symbol_value, const Args &... other_symbol_values); /** @@ -1420,10 +1420,10 @@ namespace Differentiation } - template + template types::substitution_map make_substitution_map( - const std::pair &symbol_value, + const std::pair &symbol_value, const Args &... other_symbol_values) { types::substitution_map substitution_map; @@ -1536,12 +1536,12 @@ namespace Differentiation template void add_to_substitution_map( - types::substitution_map & substitution_map, - const std::pair &symbol_value) + types::substitution_map & substitution_map, + const std::pair &symbol_value) { add_to_substitution_map(substitution_map, symbol_value.first, @@ -1550,12 +1550,12 @@ namespace Differentiation template void add_to_substitution_map( - types::substitution_map & substitution_map, - const std::vector> &symbol_values) + types::substitution_map & substitution_map, + const std::vector> &symbol_values) { for (const auto &entry : symbol_values) { @@ -1581,13 +1581,13 @@ namespace Differentiation template void add_to_substitution_map( - types::substitution_map & substitution_map, - const std::pair &symbol_value, + types::substitution_map & substitution_map, + const std::pair &symbol_value, const Args &... other_symbol_values) { add_to_substitution_map(substitution_map, -- 2.39.5