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

Fixed g++ -Wshadow warning message.

This commit is contained in:
Edoardo Prezioso 2012-10-17 00:29:06 +02:00
parent 61365ea0e5
commit c1718ae38d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/checkstl.cpp
View File

@ -39,12 +39,12 @@ void CheckStl::iteratorsError(const Token *tok, const std::string &container1, c
} }
// Error message used when dereferencing an iterator that has been erased.. // Error message used when dereferencing an iterator that has been erased..
void CheckStl::dereferenceErasedError(const Token *erase, const Token* deref, const std::string &itername) void CheckStl::dereferenceErasedError(const Token *erased, const Token* deref, const std::string &itername)
{ {
if (erase) { if (erased) {
std::list<const Token*> callstack; std::list<const Token*> callstack;
callstack.push_back(deref); callstack.push_back(deref);
callstack.push_back(erase); callstack.push_back(erased);
reportError(callstack, Severity::error, "eraseDereference", reportError(callstack, Severity::error, "eraseDereference",
"Iterator '" + itername + "' used after element has been erased.\n" "Iterator '" + itername + "' used after element has been erased.\n"
"The iterator '" + itername + "' is invalid after the element it pointed to has been erased. " "The iterator '" + itername + "' is invalid after the element it pointed to has been erased. "

2
lib/checkstl.h
View File

@ -140,7 +140,7 @@ public:
* @param tok token where error occurs * @param tok token where error occurs
* @param itername iterator name * @param itername iterator name
*/ */
void dereferenceErasedError(const Token* erase, const Token* deref, const std::string &itername); void dereferenceErasedError(const Token* erased, const Token* deref, const std::string &itername);
private: private: