External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use struct, remove c++11 range-based loop

Browse Source
This commit is contained in:
Tuan Anh Tran 2019-09-17 10:11:45 +07:00
parent d1b566fc26
commit cacadd3259
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pugixml.cpp
View File

@ -6061,15 +6061,15 @@ namespace pugi
PUGI__FN bool xml_node::remove_attributes() PUGI__FN bool xml_node::remove_attributes()
{ {
for(pugi::xml_attribute a: this->attributes()) for (xml_attribute_struct* attr = this->_root->first_attribute; attr; attr = attr->next_attribute)
{ {
if (!_root || !a._attr) return false; if (!_root || !attr) return false;
if (!impl::is_attribute_of(a._attr, _root)) return false; if (!impl::is_attribute_of(attr, _root)) return false;
impl::xml_allocator& alloc = impl::get_allocator(_root); impl::xml_allocator& alloc = impl::get_allocator(_root);
if (!alloc.reserve()) return false; if (!alloc.reserve()) return false;
impl::destroy_attribute(a._attr, alloc); impl::destroy_attribute(attr, alloc);
} }
this->_root->first_attribute = nullptr; this->_root->first_attribute = nullptr;
@ -6096,14 +6096,14 @@ namespace pugi
PUGI__FN bool xml_node::remove_children() PUGI__FN bool xml_node::remove_children()
{ {
for (pugi::xml_node child: this->children()) for (xml_node_struct* child = this->_root->first_child; child; child = child->next_sibling)
{ {
if (!_root || !child._root || child._root->parent != _root) return false; if (!_root || !child || child->parent != _root) return false;
impl::xml_allocator& alloc = impl::get_allocator(_root); impl::xml_allocator& alloc = impl::get_allocator(_root);
if (!alloc.reserve()) return false; if (!alloc.reserve()) return false;
impl::destroy_node(child._root, alloc); impl::destroy_node(child, alloc);
} }
this->_root->first_child = nullptr; this->_root->first_child = nullptr;