GH #1050 JSON: fix gcc -Wshadow warnings

This commit is contained in:
Miklos Vajna
2015-12-04 09:11:42 +01:00
parent 1483d0d112
commit ce8fa7740c
8 changed files with 39 additions and 39 deletions

View File

@@ -104,8 +104,8 @@ void Object::stringify(std::ostream& out, unsigned int indent, int step) const
const std::string& Object::getKey(KeyPtrList::const_iterator& iter) const
{
ValueMap::const_iterator it = _values.begin();
ValueMap::const_iterator end = _values.end();
for (; it != end; ++it)
ValueMap::const_iterator itEnd = _values.end();
for (; it != itEnd; ++it)
{
if (it->first == **iter) return it->first;
}
@@ -121,8 +121,8 @@ void Object::set(const std::string& key, const Dynamic::Var& value)
if (_preserveInsOrder)
{
KeyPtrList::iterator it = _keys.begin();
KeyPtrList::iterator end = _keys.end();
for (; it != end; ++it)
KeyPtrList::iterator itEnd = _keys.end();
for (; it != itEnd; ++it)
{
if (key == **it) return;
}
@@ -164,9 +164,9 @@ Object::operator const Poco::DynamicStruct& () const
if (!_pStruct)
{
ValueMap::const_iterator it = _values.begin();
ValueMap::const_iterator end = _values.end();
ValueMap::const_iterator itEnd = _values.end();
_pStruct = new Poco::DynamicStruct;
for (; it != end; ++it)
for (; it != itEnd; ++it)
{
if (isObject(it))
{