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

@@ -300,9 +300,9 @@ public:
throw BadCastException();
}
void convert(bool& value) const
void convert(bool& rValue) const
{
value = !_val.isNull() && _val->size() > 0;
rValue = !_val.isNull() && _val->size() > 0;
}
void convert(float&) const
@@ -439,9 +439,9 @@ public:
throw BadCastException();
}
void convert(bool& value) const
void convert(bool& rValue) const
{
value = _val.size() > 0;
rValue = _val.size() > 0;
}
void convert(float&) const

View File

@@ -216,8 +216,8 @@ private:
if (indent > 0) out << std::endl;
typename C::const_iterator it = container.begin();
typename C::const_iterator end = container.end();
for (; it != end;)
typename C::const_iterator itEnd = container.end();
for (; it != itEnd;)
{
for(unsigned int i = 0; i < indent; i++) out << ' ';
@@ -392,9 +392,9 @@ public:
throw BadCastException();
}
void convert(bool& value) const
void convert(bool& rValue) const
{
value = !_val.isNull() && _val->size() > 0;
rValue = !_val.isNull() && _val->size() > 0;
}
void convert(float&) const
@@ -534,9 +534,9 @@ public:
throw BadCastException();
}
void convert(bool& value) const
void convert(bool& rValue) const
{
value = _val.size() > 0;
rValue = _val.size() > 0;
}
void convert(float&) const

View File

@@ -119,9 +119,9 @@ private:
};
inline void PrintHandler::setIndent(unsigned indent)
inline void PrintHandler::setIndent(unsigned newIndent)
{
_indent = indent;
_indent = newIndent;
}