walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix a few cppcheck internal warnings

This commit is contained in:
Daniel Marjamäki 2019-08-17 16:02:58 +02:00
parent eaf7224f6a
commit c3a27eb8c1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/templatesimplifier.cpp
View File

@ -1469,7 +1469,7 @@ void TemplateSimplifier::addNamespace(const TokenAndName &templateDeclaration, c
}
if (inTemplate) {
if (insert)
mTokenList.back()->tokAt(offset)->str(mTokenList.back()->tokAt(offset)->str() + token);
mTokenList.back()->tokAt(offset)->str(mTokenList.back()->strAt(offset) + token);
else
mTokenList.back()->str(mTokenList.back()->str() + token);
if (token == ">") {
@ -1492,7 +1492,7 @@ void TemplateSimplifier::addNamespace(const TokenAndName &templateDeclaration, c
if (!inTemplate)
mTokenList.back()->tokAt(offset)->insertToken(templateDeclaration.scope().substr(start), "");
else
mTokenList.back()->tokAt(offset)->str(mTokenList.back()->tokAt(offset)->str() + templateDeclaration.scope().substr(start));
mTokenList.back()->tokAt(offset)->str(mTokenList.back()->strAt(offset) + templateDeclaration.scope().substr(start));
mTokenList.back()->tokAt(offset)->insertToken("::", "");
} else {
if (!inTemplate)
@ -2042,7 +2042,7 @@ void TemplateSimplifier::expandTemplate(
mTokenList.addtoken(tok3);
// look for template definitions
if (Token::Match(tok3, "template <")) {
if (Token::simpleMatch(tok3, "template <")) {
Token * tok2 = findTemplateDeclarationEnd(tok3);
if (tok2)
templates.push(tok2);