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

Improved checking of const functions in checkIncorrectLogicOperator

This commit is contained in:
Daniel Marjamäki 2014-03-14 17:37:53 +01:00
parent c625606f45
commit a929b2146e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkother.cpp
View File

@ -1370,10 +1370,9 @@ void CheckOther::checkIncorrectLogicOperator()
if (!MathLib::isInt(value2) && !MathLib::isFloat(value2)) if (!MathLib::isInt(value2) && !MathLib::isFloat(value2))
continue; continue;
const std::set<std::string> constStandardFunctions; if (isSameExpression(comp1, comp2, _settings->library.functionconst))
if (isSameExpression(comp1, comp2, constStandardFunctions))
continue; // same expressions => only report that there are same expressions continue; // same expressions => only report that there are same expressions
if (!isSameExpression(expr1, expr2, constStandardFunctions)) if (!isSameExpression(expr1, expr2, _settings->library.functionconst))
continue; continue;
const bool isfloat = astIsFloat(expr1) || MathLib::isFloat(value1) || astIsFloat(expr2) || MathLib::isFloat(value2); const bool isfloat = astIsFloat(expr1) || MathLib::isFloat(value1) || astIsFloat(expr2) || MathLib::isFloat(value2);