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

reduced -Wshadow warnings from gcc-4.4

This commit is contained in:
Martin Ettl 2010-04-08 22:56:34 +02:00
parent 9a4707c025
commit f6a526c8c8
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/checkmemoryleak.h
View File

@ -171,14 +171,14 @@ public:
{ } { }
/** @brief This constructor is used when running checks */ /** @brief This constructor is used when running checks */
CheckMemoryLeakInFunction(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) CheckMemoryLeakInFunction(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
: Check(tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger) : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
{ } { }
/** @brief run all simplified checks */ /** @brief run all simplified checks */
void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) void runSimplifiedChecks(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
{ {
CheckMemoryLeakInFunction checkMemoryLeak(tokenizer, settings, errorLogger); CheckMemoryLeakInFunction checkMemoryLeak(tokenizr, settings, errLog);
checkMemoryLeak.check(); checkMemoryLeak.check();
} }
@ -339,13 +339,13 @@ public:
CheckMemoryLeakInClass() : Check(), CheckMemoryLeak(0, 0) CheckMemoryLeakInClass() : Check(), CheckMemoryLeak(0, 0)
{ } { }
CheckMemoryLeakInClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) CheckMemoryLeakInClass(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
: Check(tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger) : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
{ } { }
void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) void runSimplifiedChecks(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
{ {
CheckMemoryLeakInClass checkMemoryLeak(tokenizer, settings, errorLogger); CheckMemoryLeakInClass checkMemoryLeak(tokenizr, settings, errLog);
checkMemoryLeak.check(); checkMemoryLeak.check();
} }
@ -379,13 +379,13 @@ public:
CheckMemoryLeakStructMember() : Check(), CheckMemoryLeak(0, 0) CheckMemoryLeakStructMember() : Check(), CheckMemoryLeak(0, 0)
{ } { }
CheckMemoryLeakStructMember(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) CheckMemoryLeakStructMember(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
: Check(tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger) : Check(tokenizr, settings, errLog), CheckMemoryLeak(tokenizr, errLog)
{ } { }
void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) void runSimplifiedChecks(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog)
{ {
CheckMemoryLeakStructMember checkMemoryLeak(tokenizer, settings, errorLogger); CheckMemoryLeakStructMember checkMemoryLeak(tokenizr, settings, errLog);
checkMemoryLeak.check(); checkMemoryLeak.check();
} }

4
lib/cppcheck.cpp
View File

@ -54,9 +54,9 @@ CppCheck::~CppCheck()
} }
void CppCheck::settings(const Settings &settings) void CppCheck::settings(const Settings &currentSettings)
{ {
_settings = settings; _settings = currentSettings;
} }
void CppCheck::addFile(const std::string &path) void CppCheck::addFile(const std::string &path)