From 2e8089b6bf50f50bd552d10962a877884c552a22 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Thu, 12 May 2022 13:38:22 +0200 Subject: [PATCH] Workaround for msvc compiler bug https://developercommunity.visualstudio.com/t/Alias-template-inside-fold-expression-fa/10040507 --- .../functions/FN_multi_function_builder.hh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/blender/functions/FN_multi_function_builder.hh b/source/blender/functions/FN_multi_function_builder.hh index dc91c9ee47c..e6dc01eb539 100644 --- a/source/blender/functions/FN_multi_function_builder.hh +++ b/source/blender/functions/FN_multi_function_builder.hh @@ -207,8 +207,8 @@ void execute_materialized(TypeSequence /* param_tags */, ( /* Setup information for all parameters. */ [&] { - using ParamTag = ParamTags; - using T = typename ParamTag::base_type; + typedef ParamTags ParamTag; + typedef typename ParamTag::base_type T; [[maybe_unused]] ArgInfo &arg_info = std::get(args_info); if constexpr (ParamTag::category == MFParamCategory::SingleInput) { VArray &varray = *args; @@ -282,8 +282,8 @@ void execute_materialized(TypeSequence /* param_tags */, ( /* Destruct values that have been materialized before. */ [&] { - using ParamTag = ParamTags; - using T = typename ParamTag::base_type; + typedef ParamTags ParamTag; + typedef typename ParamTag::base_type T; [[maybe_unused]] ArgInfo &arg_info = std::get(args_info); if constexpr (ParamTag::category == MFParamCategory::SingleInput) { if (arg_info.mode == ArgMode::Materialized) { @@ -298,8 +298,8 @@ void execute_materialized(TypeSequence /* param_tags */, ( /* Destruct buffers for single value inputs. */ [&] { - using ParamTag = ParamTags; - using T = typename ParamTag::base_type; + typedef ParamTags ParamTag; + typedef typename ParamTag::base_type T; [[maybe_unused]] ArgInfo &arg_info = std::get(args_info); if constexpr (ParamTag::category == MFParamCategory::SingleInput) { if (arg_info.mode == ArgMode::Single) { @@ -347,8 +347,8 @@ template class CustomMF : public MultiFunction { ( /* Get all parameters from #params and store them in #retrieved_params. */ [&]() { - using ParamTag = typename TagsSequence::template at_index; - using T = typename ParamTag::base_type; + typedef typename TagsSequence::template at_index ParamTag; + typedef typename ParamTag::base_type T; if constexpr (ParamTag::category == MFParamCategory::SingleInput) { std::get(retrieved_params) = params.readonly_single_input(I); @@ -402,7 +402,7 @@ template class CustomMF : public MultiFunction { ( /* Loop over all parameter types and add an entry for each in the signature. */ [&] { - using ParamTag = typename TagsSequence::template at_index; + typedef typename TagsSequence::template at_index ParamTag; signature.add(ParamTag(), ""); }(), ...);