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

Try to fix travis. use Token::simpleMatch instead of Token::Match.

This commit is contained in:
Daniel Marjamäki 2016-01-10 21:00:42 +01:00
parent 4269702755
commit 760d5ab7f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checktype.cpp
View File

@ -48,8 +48,8 @@ void CheckType::checkTooBigBitwiseShift()
for (std::size_t i = 0; i < functions; ++i) { for (std::size_t i = 0; i < functions; ++i) {
const Scope * scope = symbolDatabase->functionScopes[i]; const Scope * scope = symbolDatabase->functionScopes[i];
for (const Token* tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) { for (const Token* tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) {
// C++ and macro: OUT(x<<y) // C++ and macro: OUT(x<<y)
if (_tokenizer->isCPP() && Token::Match(tok, "[;{}] %name% (") && Token::Match(tok->linkAt(2), ") ;") && tok->next()->isUpperCaseName() && !tok->next()->function()) if (_tokenizer->isCPP() && Token::Match(tok, "[;{}] %name% (") && Token::simpleMatch(tok->linkAt(2), ") ;") && tok->next()->isUpperCaseName() && !tok->next()->function())
tok = tok->linkAt(2); tok = tok->linkAt(2);
if (!Token::Match(tok, "<<|>>|<<=|>>=")) if (!Token::Match(tok, "<<|>>|<<=|>>="))