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

Fixed #4787 (False Positive: Unused private function)

This commit is contained in:
Daniel Marjamäki 2014-01-01 18:36:51 +01:00
parent 5539e9ea0f
commit d62055277d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkclass.cpp
View File

@ -805,7 +805,7 @@ static bool checkFunctionUsage(const std::string& name, const Scope* scope)
if (func->functionScope) { if (func->functionScope) {
if (Token::Match(func->tokenDef, "%var% (")) { if (Token::Match(func->tokenDef, "%var% (")) {
for (const Token *ftok = func->tokenDef->tokAt(2); ftok && ftok->str() != ")"; ftok = ftok->next()) { for (const Token *ftok = func->tokenDef->tokAt(2); ftok && ftok->str() != ")"; ftok = ftok->next()) {
if (Token::Match(ftok, "= %var% (") && ftok->strAt(1) == name) if (Token::Match(ftok, "= %var% [(,)]") && ftok->strAt(1) == name)
return true; return true;
if (ftok->str() == "(") if (ftok->str() == "(")
ftok = ftok->link(); ftok = ftok->link();

13
test/testunusedprivfunc.cpp
View File

@ -45,6 +45,7 @@ private:
TEST_CASE(func_pointer3); TEST_CASE(func_pointer3);
TEST_CASE(func_pointer4); // ticket #2807 TEST_CASE(func_pointer4); // ticket #2807
TEST_CASE(func_pointer5); // ticket #2233 TEST_CASE(func_pointer5); // ticket #2233
TEST_CASE(func_pointer6); // ticket #4787
TEST_CASE(ctor); TEST_CASE(ctor);
TEST_CASE(ctor2); TEST_CASE(ctor2);
@ -314,6 +315,18 @@ private:
} }
void func_pointer6() { // #4787
check("class Test {\n"
"private:\n"
" static void a(const char* p) { }\n"
"public:\n"
" void test(void* f = a) {\n"
" f(\"test\");\n"
" }\n"
"};");
ASSERT_EQUALS("", errout.str());
}
void ctor() { void ctor() {
check("class PrivateCtor\n" check("class PrivateCtor\n"