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

Fixed gcc shadowing warnings

This commit is contained in:
PKEuS 2015-01-30 22:04:26 +01:00
parent dcc1362890
commit 3a1bd4a5ad
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/symboldatabase.cpp
View File

@ -1955,7 +1955,7 @@ bool Variable::arrayDimensions(const Library* lib)
{ {
const Library::Container* container = lib->detectContainer(_start); const Library::Container* container = lib->detectContainer(_start);
if (container && container->arrayLike_indexOp && container->size_templateArgNo > 0) { if (container && container->arrayLike_indexOp && container->size_templateArgNo > 0) {
Dimension dimension; Dimension dimension_;
const Token* tok = Token::findsimplematch(_start, "<"); const Token* tok = Token::findsimplematch(_start, "<");
if (tok) { if (tok) {
tok = tok->next(); tok = tok->next();
@ -1963,14 +1963,14 @@ bool Variable::arrayDimensions(const Library* lib)
tok = tok->nextTemplateArgument(); tok = tok->nextTemplateArgument();
} }
if (tok) { if (tok) {
dimension.start = tok; dimension_.start = tok;
dimension.end = Token::findmatch(tok, ",|>"); dimension_.end = Token::findmatch(tok, ",|>");
if (dimension.end) if (dimension_.end)
dimension.end = dimension.end->previous(); dimension_.end = dimension_.end->previous();
if (dimension.start == dimension.end) if (dimension_.start == dimension_.end)
dimension.num = MathLib::toLongNumber(dimension.start->str()); dimension_.num = MathLib::toLongNumber(dimension_.start->str());
} }
_dimensions.push_back(dimension); _dimensions.push_back(dimension_);
return true; return true;
} }
} }
@ -1986,21 +1986,21 @@ bool Variable::arrayDimensions(const Library* lib)
if (dim) if (dim)
dim = dim->next(); dim = dim->next();
bool isArray = false; bool arr = false;
while (dim && dim->next() && dim->str() == "[") { while (dim && dim->next() && dim->str() == "[") {
Dimension dimension; Dimension dimension_;
// check for empty array dimension [] // check for empty array dimension []
if (dim->next()->str() != "]") { if (dim->next()->str() != "]") {
dimension.start = dim->next(); dimension_.start = dim->next();
dimension.end = dim->link()->previous(); dimension_.end = dim->link()->previous();
if (dimension.start == dimension.end && dimension.start->isNumber()) if (dimension_.start == dimension_.end && dimension_.start->isNumber())
dimension.num = MathLib::toLongNumber(dimension.start->str()); dimension_.num = MathLib::toLongNumber(dimension_.start->str());
} }
_dimensions.push_back(dimension); _dimensions.push_back(dimension_);
dim = dim->link()->next(); dim = dim->link()->next();
isArray = true; arr = true;
} }
return isArray; return arr;
} }
static std::ostream & operator << (std::ostream & s, Scope::ScopeType type) static std::ostream & operator << (std::ostream & s, Scope::ScopeType type)