diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp index 71ca4495a..7c1180ad1 100644 --- a/lib/checkunusedvar.cpp +++ b/lib/checkunusedvar.cpp @@ -230,9 +230,7 @@ void Variables::eraseAliases(unsigned int varid) VariableUsage *usage = find(varid); if (usage) { - std::set::const_iterator aliases; - - for (aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) + for (std::set::const_iterator aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) erase(*aliases); } } @@ -280,9 +278,7 @@ void Variables::readAliases(unsigned int varid, const Token* tok) VariableUsage *usage = find(varid); if (usage) { - std::set::iterator aliases; - - for (aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) { + for (std::set::iterator aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) { VariableUsage *aliased = find(*aliases); if (aliased) { @@ -317,9 +313,7 @@ void Variables::writeAliases(unsigned int varid, const Token* tok) VariableUsage *usage = find(varid); if (usage) { - std::set::const_iterator aliases; - - for (aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) { + for (std::set::const_iterator aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) { VariableUsage *aliased = find(*aliases); if (aliased) { @@ -344,9 +338,7 @@ void Variables::use(unsigned int varid, const Token* tok) usage->use(_varReadInScope); usage->_lastAccess = tok; - std::set::const_iterator aliases; - - for (aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) { + for (std::set::const_iterator aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) { VariableUsage *aliased = find(*aliases); if (aliased) { @@ -367,9 +359,7 @@ void Variables::modified(unsigned int varid, const Token* tok) usage->_modified = true; usage->_lastAccess = tok; - std::set::const_iterator aliases; - - for (aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) { + for (std::set::const_iterator aliases = usage->_aliases.begin(); aliases != usage->_aliases.end(); ++aliases) { VariableUsage *aliased = find(*aliases); if (aliased) {