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

Fixed #2484 (false positive because template is not instantiated properly)

This commit is contained in:
Daniel Marjamäki 2011-01-22 12:42:53 +01:00
parent bc31f317bc
commit 5c88129f01
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/tokenize.cpp
View File

@ -2651,35 +2651,6 @@ static void removeTemplates(Token *tok)
void Tokenizer::simplifyTemplates() void Tokenizer::simplifyTemplates()
{ {
// Don't simplify C files
{
if (_files.empty())
return;
std::string::size_type pos = _files[0].rfind(".");
if (pos == std::string::npos)
return;
const std::string ext(_files[0].substr(pos));
if (ext == ".c" || ext == ".C")
return;
}
// Remove "typename" unless used in template arguments..
for (Token *tok = _tokens; tok; tok = tok->next())
{
if (tok->str() == "typename")
tok->deleteThis();
if (Token::simpleMatch(tok, "template <"))
{
while (tok && tok->str() != ">")
tok = tok->next();
if (!tok)
break;
}
}
std::set<std::string> expandedtemplates; std::set<std::string> expandedtemplates;
// Locate specialized templates.. // Locate specialized templates..
@ -2775,6 +2746,22 @@ void Tokenizer::simplifyTemplates()
return; return;
} }
// There are templates..
// Remove "typename" unless used in template arguments..
for (Token *tok = _tokens; tok; tok = tok->next())
{
if (tok->str() == "typename")
tok->deleteThis();
if (Token::simpleMatch(tok, "template <"))
{
while (tok && tok->str() != ">")
tok = tok->next();
if (!tok)
break;
}
}
// Locate possible instantiations of templates.. // Locate possible instantiations of templates..
std::list<Token *> used; std::list<Token *> used;
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())