Fixed the GCC Wshadow warnings introduced recently.
This commit is contained in:
parent
4368f66a00
commit
358fb9a284
|
@ -389,8 +389,8 @@ public:
|
||||||
* Associate this token with given scope
|
* Associate this token with given scope
|
||||||
* @param scope Scope to be associated
|
* @param scope Scope to be associated
|
||||||
*/
|
*/
|
||||||
void scope(Scope* scope) {
|
void scope(Scope* s) {
|
||||||
_scope = scope;
|
_scope = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -336,8 +336,8 @@ private:
|
||||||
|
|
||||||
void test_isVariableDeclarationIdentifiesArray() {
|
void test_isVariableDeclarationIdentifiesArray() {
|
||||||
reset();
|
reset();
|
||||||
givenACodeSampleToTokenize array("::std::string v[3];");
|
givenACodeSampleToTokenize arr("::std::string v[3];");
|
||||||
bool result = si.isVariableDeclaration(array.tokens(), vartok, typetok);
|
bool result = si.isVariableDeclaration(arr.tokens(), vartok, typetok);
|
||||||
ASSERT_EQUALS(true, result);
|
ASSERT_EQUALS(true, result);
|
||||||
ASSERT_EQUALS("v", vartok->str());
|
ASSERT_EQUALS("v", vartok->str());
|
||||||
ASSERT_EQUALS("string", typetok->str());
|
ASSERT_EQUALS("string", typetok->str());
|
||||||
|
@ -349,8 +349,8 @@ private:
|
||||||
|
|
||||||
void test_isVariableDeclarationIdentifiesOfArrayPointers() {
|
void test_isVariableDeclarationIdentifiesOfArrayPointers() {
|
||||||
reset();
|
reset();
|
||||||
givenACodeSampleToTokenize array("A *a[5];");
|
givenACodeSampleToTokenize arr("A *a[5];");
|
||||||
bool result = si.isVariableDeclaration(array.tokens(), vartok, typetok);
|
bool result = si.isVariableDeclaration(arr.tokens(), vartok, typetok);
|
||||||
ASSERT_EQUALS(true, result);
|
ASSERT_EQUALS(true, result);
|
||||||
ASSERT_EQUALS("a", vartok->str());
|
ASSERT_EQUALS("a", vartok->str());
|
||||||
ASSERT_EQUALS("A", typetok->str());
|
ASSERT_EQUALS("A", typetok->str());
|
||||||
|
|
Loading…
Reference in New Issue