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

Merge pull request #369 from Dmitry-Me/useBoolFlagToAvoidComparisonDuplication 

Use boolean flag to avoid comparison duplication
This commit is contained in:
Daniel Marjamäki 2014-07-18 18:11:53 +02:00
parent 54dbb5f832 fae9d975cf
commit c252885bf8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkclass.cpp
View File

@ -1590,13 +1590,16 @@ void CheckClass::checkConst()
} else if (Token::Match(previous->previous(), "*|& >")) { } else if (Token::Match(previous->previous(), "*|& >")) {
const Token *temp = previous; const Token *temp = previous;
bool foundConst = false;
while (!Token::Match(temp->previous(), ";|}|{|public:|protected:|private:")) { while (!Token::Match(temp->previous(), ";|}|{|public:|protected:|private:")) {
temp = temp->previous(); temp = temp->previous();
if (temp->str() == "const") if (temp->str() == "const") {
foundConst = true;
break; break;
}
} }
if (temp->str() != "const") if (!foundConst)
continue; continue;
} else if (func->isOperator && Token::Match(previous, ";|{|}|public:|private:|protected:")) { // Operator without return type: conversion operator } else if (func->isOperator && Token::Match(previous, ";|{|}|public:|private:|protected:")) { // Operator without return type: conversion operator
const std::string& opName = func->tokenDef->str(); const std::string& opName = func->tokenDef->str();