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

Fixed #1708 (False positive for const)

This commit is contained in:
Robert Reif 2010-05-25 06:55:49 +02:00 committed by Daniel Marjamäki
parent 5692e7a6f6
commit 4306082fcf
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkclass.cpp
View File

@ -192,9 +192,11 @@ CheckClass::Var *CheckClass::getVarList(const Token *tok1, bool withClasses, boo
} }
if (next && Token::Match(next, "> %var% ;")) if (next && Token::Match(next, "> %var% ;"))
varname = next->strAt(1); varname = next->strAt(1);
else if (next && Token::Match(next, "> * %var% ;"))
varname = next->strAt(2);
} }
// If the varname was set in one of the two if-block above, create a entry for this variable.. // If the varname was set in the if-blocks above, create a entry for this variable..
if (!varname.empty() && varname != "operator") if (!varname.empty() && varname != "operator")
{ {
Var *var = new Var(varname, false, priv, isMutable, isStatic, varlist); Var *var = new Var(varname, false, priv, isMutable, isStatic, varlist);
@ -1905,6 +1907,9 @@ bool CheckClass::isMemberVar(const std::string &classname, const Var *varlist, c
if (tok->str() == "this") if (tok->str() == "this")
return true; return true;
if (Token::Match(tok, "( * %var% ) ["))
tok = tok->tokAt(2);
// ignore class namespace // ignore class namespace
if (tok->str() == classname && tok->next()->str() == "::") if (tok->str() == classname && tok->next()->str() == "::")
tok = tok->tokAt(2); tok = tok->tokAt(2);

15
test/testclass.cpp
View File

@ -119,6 +119,7 @@ private:
TEST_CASE(const21); // ticket #1683 TEST_CASE(const21); // ticket #1683
TEST_CASE(const22); TEST_CASE(const22);
TEST_CASE(const23); // ticket #1699 TEST_CASE(const23); // ticket #1699
TEST_CASE(const24); // ticket #1708
TEST_CASE(constoperator1); // operator< can often be const TEST_CASE(constoperator1); // operator< can often be const
TEST_CASE(constoperator2); // operator<< TEST_CASE(constoperator2); // operator<<
TEST_CASE(constincdec); // increment/decrement => non-const TEST_CASE(constincdec); // increment/decrement => non-const
@ -3410,6 +3411,20 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void const24()
{
checkConst("class Class {\n"
"public:\n"
"void Settings::SetSetting(QString strSetting, QString strNewVal)\n"
"{\n"
" (*m_pSettings)[strSetting] = strNewVal;\n"
"}\n"
"private:\n"
" std::map<QString, QString> *m_pSettings;\n"
"};\n");
ASSERT_EQUALS("", errout.str());
}
// increment/decrement => not const // increment/decrement => not const
void constincdec() void constincdec()
{ {