summaryrefslogtreecommitdiff
path: root/src/pugixml.cpp
diff options
context:
space:
mode:
authorArseny Kapoulkine <arseny.kapoulkine@gmail.com>2014-11-17 19:52:23 -0800
committerArseny Kapoulkine <arseny.kapoulkine@gmail.com>2014-11-17 19:52:23 -0800
commite9956ae3a6593efc6f8cb344a00432ece51d1574 (patch)
tree7a26d5c9e7faf32a5119bcc10040aa959b4b8686 /src/pugixml.cpp
parent79ed320f894c406dd3548e7d34cadd07fa82fb53 (diff)
Rename xml_document::load to load_string
This should completely eliminate the confusion between load and load_file. Of course, for compatibility reasons we have to preserve the old variant - it will be deprecated in a future version and subsequently removed.
Diffstat (limited to 'src/pugixml.cpp')
-rw-r--r--src/pugixml.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 884184c..852ccb9 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -5995,7 +5995,7 @@ namespace pugi
}
#endif
- PUGI__FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
+ PUGI__FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
{
// Force native encoding (skip autodetection)
#ifdef PUGIXML_WCHAR_MODE
@@ -6007,6 +6007,11 @@ namespace pugi
return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding);
}
+ PUGI__FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
+ {
+ return load_string(contents, options);
+ }
+
PUGI__FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
{
reset();