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

Compatibility fixes (fixed warnings in gcc, msvc7, fixed errors in bcc, cw, msvc6)

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@939 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine@gmail.com 2012-12-07 06:35:53 +00:00
parent 26444f90a9
commit 9b9a414ab6
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pugixml.cpp
View File

@ -4554,14 +4554,14 @@ namespace pugi
if (!extra) return impl::make_parse_result(status_out_of_memory); if (!extra) return impl::make_parse_result(status_out_of_memory);
// save name; name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level // save name; name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level
char_t* name = _root->name; char_t* rootname = _root->name;
_root->name = 0; _root->name = 0;
// parse // parse
xml_parse_result res = load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer); xml_parse_result res = impl::load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer);
// restore name // restore name
_root->name = name; _root->name = rootname;
// add extra buffer to the list // add extra buffer to the list
extra->next = doc->extra_buffers; extra->next = doc->extra_buffers;
@ -5307,21 +5307,21 @@ namespace pugi
{ {
reset(); reset();
return load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer); return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer);
} }
PUGI__FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding) PUGI__FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
{ {
reset(); reset();
return load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer); return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer);
} }
PUGI__FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding) PUGI__FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
{ {
reset(); reset();
return load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer); return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer);
} }
PUGI__FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const PUGI__FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const

2
src/pugixml.hpp
View File

@ -830,7 +830,7 @@ namespace pugi
status_bad_end_element, // Parsing error occurred while parsing end element tag status_bad_end_element, // Parsing error occurred while parsing end element tag
status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag) status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag)
status_append_invalid_root, // Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer) status_append_invalid_root // Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer)
}; };
// Parsing result // Parsing result

2
tests/test_dom_modify.cpp
View File

@ -1019,7 +1019,7 @@ TEST(dom_node_append_buffer_out_of_memory_buffer)
{ {
test_runner::_memory_fail_threshold = 32768 + 128; test_runner::_memory_fail_threshold = 32768 + 128;
const char data[128] = {}; char data[128] = {0};
xml_document doc; xml_document doc;
CHECK(doc.append_buffer(data, sizeof(data)).status == status_out_of_memory); CHECK(doc.append_buffer(data, sizeof(data)).status == status_out_of_memory);

2
tests/test_dom_traverse.cpp
View File

@ -545,6 +545,8 @@ TEST(dom_node_find_child_by_attribute_null)
xml_node node2 = doc.append_child(STR("a")); xml_node node2 = doc.append_child(STR("a"));
xml_node node3 = doc.append_child(STR("a")); xml_node node3 = doc.append_child(STR("a"));
(void)node0;
// this adds an attribute with null name and/or value in the internal representation // this adds an attribute with null name and/or value in the internal representation
node1.append_attribute(STR("")); node1.append_attribute(STR(""));
node2.append_attribute(STR("id")); node2.append_attribute(STR("id"));