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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2016-12-22 09:40:39 +01:00
parent df6ae9f3b4
commit 2ce4811998
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/tokenize.cpp
View File

@ -54,7 +54,8 @@ namespace {
}; };
/** Return whether tok is the "{" that starts an enumerator list */ /** Return whether tok is the "{" that starts an enumerator list */
bool isEnumStart(const Token* tok) { bool isEnumStart(const Token* tok)
{
if (!tok || tok->str() != "{") if (!tok || tok->str() != "{")
return false; return false;
return (tok->strAt(-1) == "enum") || (tok->strAt(-2) == "enum"); return (tok->strAt(-1) == "enum") || (tok->strAt(-2) == "enum");
@ -2466,8 +2467,7 @@ void Tokenizer::setVarIdClassDeclaration(const Token * const startToken,
} else if (tok->str() == "}") { } else if (tok->str() == "}") {
--indentlevel; --indentlevel;
inEnum = false; inEnum = false;
} } else if (initList && indentlevel == 0 && Token::Match(tok->previous(), "[,:] %name% [({]")) {
else if (initList && indentlevel == 0 && Token::Match(tok->previous(), "[,:] %name% [({]")) {
const std::map<std::string, unsigned int>::const_iterator it = variableId.find(tok->str()); const std::map<std::string, unsigned int>::const_iterator it = variableId.find(tok->str());
if (it != variableId.end()) { if (it != variableId.end()) {
tok->varId(it->second); tok->varId(it->second);