parent
ffdf13fcdb
commit
4c5310433c
|
@ -148,9 +148,9 @@ TemplateSimplifier::TokenAndName::TokenAndName(Token *token, const std::string &
|
|||
const Token * start = mNameToken;
|
||||
|
||||
while (start && (Token::Match(start->tokAt(-2), "%name% ::") ||
|
||||
(Token::simpleMatch(start->tokAt(-2), "> ::") &&
|
||||
start->tokAt(-2)->findOpeningBracket() &&
|
||||
Token::Match(start->tokAt(-2)->findOpeningBracket()->previous(), "%name% <")))) {
|
||||
(Token::simpleMatch(start->tokAt(-2), "> ::") &&
|
||||
start->tokAt(-2)->findOpeningBracket() &&
|
||||
Token::Match(start->tokAt(-2)->findOpeningBracket()->previous(), "%name% <")))) {
|
||||
if (start->strAt(-2) == ">")
|
||||
start = start->tokAt(-2)->findOpeningBracket()->previous();
|
||||
else
|
||||
|
|
|
@ -1852,14 +1852,14 @@ static void valueFlowReverse(TokenList *tokenlist,
|
|||
}
|
||||
const Token *expr = Token::findmatch(tok2, "%varid%", varid);
|
||||
valueFlowForward(const_cast<Token*>(startTok),
|
||||
endTok,
|
||||
expr,
|
||||
values,
|
||||
false,
|
||||
false,
|
||||
tokenlist,
|
||||
errorLogger,
|
||||
settings);
|
||||
endTok,
|
||||
expr,
|
||||
values,
|
||||
false,
|
||||
false,
|
||||
tokenlist,
|
||||
errorLogger,
|
||||
settings);
|
||||
}
|
||||
}
|
||||
const Token *vartok = Token::findmatch(tok2->link(), "%varid%", tok2, varid);
|
||||
|
|
Loading…
Reference in New Issue