diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-09 17:25:35 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-09 17:25:35 +0000 |
| commit | 427714178ec89e3a24933a305a4de6ab1089847c (patch) | |
| tree | 4434a799bc0316d4716a35d965de45a238387640 /src/pugixml.hpp | |
| parent | ca9704d65181111a182bce3ad97913dd4cfd6058 (diff) | |
Minor loading functions refactoring, fixed XPath append_node for MSVC10
git-svn-id: http://pugixml.googlecode.com/svn/trunk@395 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src/pugixml.hpp')
| -rw-r--r-- | src/pugixml.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/pugixml.hpp b/src/pugixml.hpp index b9d385f..8b4a733 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -1861,6 +1861,8 @@ namespace pugi void create();
void destroy();
+ xml_parse_result load_buffer_impl(void* contents, size_t size, unsigned int options, encoding_t encoding, bool is_mutable, bool own);
+
public:
/**
* Default ctor, makes empty document
@@ -1873,7 +1875,7 @@ namespace pugi ~xml_document();
public:
-#ifndef PUGIXML_NO_STL
+ #ifndef PUGIXML_NO_STL
/**
* Load document from stream.
*
@@ -1881,8 +1883,8 @@ namespace pugi * \param options - parsing options
* \return parsing result
*/
-
xml_parse_result load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options = parse_default, encoding_t encoding = encoding_auto);
+
/**
* Load document from stream.
*
@@ -1891,7 +1893,7 @@ namespace pugi * \return parsing result
*/
xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default);
-#endif
+ #endif
/**
* Load document from string. String has to be zero-terminated. No encoding conversions are applied.
|