organicmaps/pugixml
13
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity Actions

Fix -Wshadow warning

Browse source
This commit is contained in:
Arseny Kapoulkine 2017-09-25 21:48:37 -07:00
parent 6eb7519dba
commit febf25d1af
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/pugixml.cpp
View file

@ -7010,17 +7010,17 @@ namespace pugi
doc->reserve(); // TODO: it's not clear how to handle reserve running out of memory
doc->first_child = other_first_child;
for (xml_node_struct* child = other_first_child; child; child = child->next_sibling)
for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
{
#ifdef PUGIXML_COMPACT
// most children will have migrated when we reassigned compact_shared_parent
assert(child->parent == other || child->parent == doc);
assert(node->parent == other || node->parent == doc);
doc->reserve(); // TODO: it's not clear how to handle reserve running out of memory
child->parent = doc;
node->parent = doc;
#else
assert(child->parent == other);
child->parent = doc;
assert(node->parent == other);
node->parent = doc;
#endif
}