generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 11:31:53 +01:00
Code Issues Projects Releases Wiki Activity

GH #1050 XML: fix gcc -Wshadow warnings

Browse Source
This commit is contained in:
Miklos Vajna
2015-12-14 10:31:10 +01:00
parent cfdf3e4134
commit 063011ba75
23 changed files with 193 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
XML/src/XMLStreamParser.cpp
View File

@@ -381,7 +381,7 @@ void XMLStreamParser::popElement()
}
XMLStreamParser::EventType XMLStreamParser::nextImpl(bool peek)
XMLStreamParser::EventType XMLStreamParser::nextImpl(bool isPeek)
{
EventType e(nextBody());
@@ -400,7 +400,7 @@ XMLStreamParser::EventType XMLStreamParser::nextImpl(bool peek)
// This way, the attribute map will still be valid until we
// call next().
//
if (!peek)
if (!isPeek)
{
if (!_elementState.empty() && _elementState.back().depth == _depth)
popElement();
@@ -411,9 +411,9 @@ XMLStreamParser::EventType XMLStreamParser::nextImpl(bool peek)
}
case EV_START_ELEMENT:
{
if (const ElementEntry* e = getElement())
if (const ElementEntry* pEntry = getElement())
{
switch (e->content)
switch (pEntry->content)
{
case Content::Empty:
throw XMLStreamParserException(*this, "element in empty content");
@@ -426,7 +426,7 @@ XMLStreamParser::EventType XMLStreamParser::nextImpl(bool peek)
// If this is a peek, then delay adjusting the depth.
//
if (!peek)
if (!isPeek)
_depth++;
break;
@@ -769,10 +769,10 @@ void XMLCALL XMLStreamParser::handleStartElement(void* v, const XML_Char* name,
{
QName qn;
splitName(*atts, qn);
AttributeMapType::value_type v(qn, AttributeValueType());
v.second.value = *(atts + 1);
v.second.handled = false;
pe->attributeMap.insert(v);
AttributeMapType::value_type value(qn, AttributeValueType());
value.second.value = *(atts + 1);
value.second.handled = false;
pe->attributeMap.insert(value);
}
else
{