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 2018-08-05 10:48:28 +02:00
parent 0e491b41a8
commit bcdd58de0b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/checkfunctions.cpp
View File

@ -231,8 +231,7 @@ void CheckFunctions::checkMathFunctions()
if ((MathLib::isInt(number) && MathLib::toLongNumber(number) <= 0) ||
(MathLib::isFloat(number) && MathLib::toDoubleNumber(number) <= 0.))
mathfunctionCallWarning(tok);
}
else if (Token::Match(tok, "log1p|log1pf|log1pl ( %num% )")) {
} else if (Token::Match(tok, "log1p|log1pf|log1pl ( %num% )")) {
const std::string& number = tok->strAt(2);
if ((MathLib::isInt(number) && MathLib::toLongNumber(number) <= -1) ||
(MathLib::isFloat(number) && MathLib::toDoubleNumber(number) <= -1.))

6
lib/checkstl.cpp
View File

@ -399,9 +399,9 @@ void CheckStl::mismatchingContainers()
const Token * const argTok = args[argnr - 1];
if (i->first) {
firstArg = argTok;
}
if(i->last && firstArg && argTok && isSameExpression(true, false, firstArg, argTok, mSettings->library, false)) {
sameIteratorExpressionError(firstArg);
}
if (i->last && firstArg && argTok && isSameExpression(true, false, firstArg, argTok, mSettings->library, false)) {
sameIteratorExpressionError(firstArg);
}
const Variable *c = getContainer(argTok);
if (c) {