From 189ce0b58174aef43034fe72b12315ea0043715e Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 14 Sep 2017 13:30:05 -0600 Subject: [PATCH] Rename template type and argument name to better reflect their purpose. --- include/deal.II/fe/fe_system.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index ed3cad06e3..caa7920589 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -449,11 +449,11 @@ public: * corresponds to this line, but this does not matter because FESystem * creates its own copy of the FE_Q object. */ - template ::type..., + template ::type..., std::pair>, unsigned int>>::value>::type> - FESystem (FESystems&& ... fe_systems); + FESystem (FEPairs&& ... fe_pairs); /** * Same as above allowing the following syntax: @@ -1151,15 +1151,20 @@ namespace } } + + // We are just forwarding/delegating to the constructor taking a std::initializer_list. // If we decide to remove the deprecated constructors, we might just use the variadic // constructor with a suitable static_assert instead of the std::enable_if. template -template -FESystem::FESystem (FESystems &&... fe_systems) - : FESystem ({std::forward(fe_systems)...}) +template +FESystem::FESystem (FEPairs &&... fe_pairs) + : + FESystem ({std::forward(fe_pairs)...}) {} + + template FESystem::FESystem (const std::initializer_list>, -- 2.39.5