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

CheckClass: Fix Cppcheck warning about mismatching function parameters

This commit is contained in:
Daniel Marjamäki 2018-06-10 22:04:22 +02:00
parent b9d03d0e23
commit 3029606342
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/checkclass.cpp
View File

@ -2332,21 +2332,21 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
void CheckClass::getFirstVirtualFunctionCallStack( void CheckClass::getFirstVirtualFunctionCallStack(
std::map<const Function *, std::list<const Token *> > & virtualFunctionCallsMap, std::map<const Function *, std::list<const Token *> > & virtualFunctionCallsMap,
const Token * callToken, const Token * callToken,
std::list<const Token *> & callstack) std::list<const Token *> & pureFuncStack)
{ {
const Function *callFunction = callToken->function(); const Function *callFunction = callToken->function();
if (callFunction->isVirtual() && (!callFunction->isPure() || !callFunction->hasBody())) { if (callFunction->isVirtual() && (!callFunction->isPure() || !callFunction->hasBody())) {
callstack.push_back(callFunction->tokenDef); pureFuncStack.push_back(callFunction->tokenDef);
return; return;
} }
std::map<const Function *, std::list<const Token *> >::const_iterator found = virtualFunctionCallsMap.find(callFunction); std::map<const Function *, std::list<const Token *> >::const_iterator found = virtualFunctionCallsMap.find(callFunction);
if (found == virtualFunctionCallsMap.end() || found->second.empty()) { if (found == virtualFunctionCallsMap.end() || found->second.empty()) {
callstack.clear(); pureFuncStack.clear();
return; return;
} }
const Token * firstCall = *found->second.begin(); const Token * firstCall = *found->second.begin();
callstack.push_back(firstCall); pureFuncStack.push_back(firstCall);
getFirstVirtualFunctionCallStack(virtualFunctionCallsMap, firstCall, callstack); getFirstVirtualFunctionCallStack(virtualFunctionCallsMap, firstCall, pureFuncStack);
} }
void CheckClass::virtualFunctionCallInConstructorError( void CheckClass::virtualFunctionCallInConstructorError(