diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-11-17 19:52:23 -0800 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-11-17 19:52:23 -0800 |
| commit | e9956ae3a6593efc6f8cb344a00432ece51d1574 (patch) | |
| tree | 7a26d5c9e7faf32a5119bcc10040aa959b4b8686 /src/pugixml.hpp | |
| parent | 79ed320f894c406dd3548e7d34cadd07fa82fb53 (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.hpp')
| -rw-r--r-- | src/pugixml.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pugixml.hpp b/src/pugixml.hpp index e252e16..7f52975 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -959,9 +959,12 @@ namespace pugi xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default); #endif - // Load document from zero-terminated string. No encoding conversions are applied. + // (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied. xml_parse_result load(const char_t* contents, unsigned int options = parse_default); + // Load document from zero-terminated string. No encoding conversions are applied. + xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default); + // Load document from file xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); xml_parse_result load_file(const wchar_t* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); |