@@ -1086,7 +1086,9 @@ struct TemplateSimplifier::DeductionCache {
10861086 // every template parameter must be deducible from the function parameters
10871087 const int typeParameterCount = parsedCandidate.typeParameters .size ();
10881088 for (int i = 0 ; i < typeParameterCount; ++i) {
1089- if (std::none_of (parsedCandidate.parameterShapes .cbegin (), parsedCandidate.parameterShapes .cend (), [i](const ParameterShape& shape) {
1089+ if (std::none_of (parsedCandidate.parameterShapes .cbegin (),
1090+ parsedCandidate.parameterShapes .cend (),
1091+ [i](const ParameterShape& shape) {
10901092 return shape.templateParameterIndex == i;
10911093 }))
10921094 return DeductionCandidate ();
@@ -4012,7 +4014,10 @@ void TemplateSimplifier::replaceTemplateUsage(
40124014 // remembered new token ranges that start in the erased tokens are gone
40134015 if (!mNewTokenRanges .empty () && !removeTokens.empty ()) {
40144016 std::unordered_set<const Token*> rangeStarts;
4015- std::transform (mNewTokenRanges .cbegin (), mNewTokenRanges .cend (), std::inserter (rangeStarts, rangeStarts.end ()), [](const std::pair<Token*, Token*>& range) {
4017+ std::transform (mNewTokenRanges .cbegin (),
4018+ mNewTokenRanges .cend (),
4019+ std::inserter (rangeStarts, rangeStarts.end ()),
4020+ [](const std::pair<Token*, Token*>& range) {
40164021 return range.first ;
40174022 });
40184023 std::unordered_set<const Token*> erasedRangeStarts;
@@ -4023,13 +4028,12 @@ void TemplateSimplifier::replaceTemplateUsage(
40234028 }
40244029 }
40254030 if (!erasedRangeStarts.empty ()) {
4026- mNewTokenRanges .erase (
4027- std::remove_if (mNewTokenRanges .begin (),
4028- mNewTokenRanges .end (),
4029- [&](const std::pair<Token*, Token*>& range) {
4031+ mNewTokenRanges .erase (std::remove_if (mNewTokenRanges .begin (),
4032+ mNewTokenRanges .end (),
4033+ [&](const std::pair<Token*, Token*>& range) {
40304034 return erasedRangeStarts.count (range.first ) != 0 ;
40314035 }),
4032- mNewTokenRanges .end ());
4036+ mNewTokenRanges .end ());
40334037 }
40344038 }
40354039 while (!removeTokens.empty ()) {
0 commit comments