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

Fixed the GCC Wshadow warnings introduced recently.

This commit is contained in:
Edoardo Prezioso 2012-08-12 17:04:37 +02:00
parent 4368f66a00
commit 358fb9a284
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/token.h
View File

@ -389,8 +389,8 @@ public:
* Associate this token with given scope
* @param scope Scope to be associated
*/
void scope(Scope* scope) {
_scope = scope;
void scope(Scope* s) {
_scope = s;
}
/**

8
test/testsymboldatabase.cpp
View File

@ -336,8 +336,8 @@ private:
void test_isVariableDeclarationIdentifiesArray() {
reset();
givenACodeSampleToTokenize array("::std::string v[3];");
bool result = si.isVariableDeclaration(array.tokens(), vartok, typetok);
givenACodeSampleToTokenize arr("::std::string v[3];");
bool result = si.isVariableDeclaration(arr.tokens(), vartok, typetok);
ASSERT_EQUALS(true, result);
ASSERT_EQUALS("v", vartok->str());
ASSERT_EQUALS("string", typetok->str());
@ -349,8 +349,8 @@ private:
void test_isVariableDeclarationIdentifiesOfArrayPointers() {
reset();
givenACodeSampleToTokenize array("A *a[5];");
bool result = si.isVariableDeclaration(array.tokens(), vartok, typetok);
givenACodeSampleToTokenize arr("A *a[5];");
bool result = si.isVariableDeclaration(arr.tokens(), vartok, typetok);
ASSERT_EQUALS(true, result);
ASSERT_EQUALS("a", vartok->str());
ASSERT_EQUALS("A", typetok->str());