From a590a69bda9069b3d4a54e86a2472c613106ff48 Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Wed, 22 Sep 2010 19:05:31 +0000 Subject: Minor UTF8 conversion refactoring, added as_utf8 and as_wide overloads with string arguments git-svn-id: http://pugixml.googlecode.com/svn/trunk@749 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugixml.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/pugixml.hpp') diff --git a/src/pugixml.hpp b/src/pugixml.hpp index 2624362..814b0b7 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -713,7 +713,6 @@ namespace pugi // Destructor, invalidates all node/attribute handles to this document ~xml_document(); - public: #ifndef PUGIXML_NO_STL // Load document from stream. xml_parse_result load(std::basic_istream >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); @@ -1036,9 +1035,11 @@ namespace pugi #ifndef PUGIXML_NO_STL // Convert wide string to UTF8 std::basic_string, std::allocator > PUGIXML_FUNCTION as_utf8(const wchar_t* str); + std::basic_string, std::allocator > PUGIXML_FUNCTION as_utf8(const std::basic_string, std::allocator >& str); // Convert UTF8 to wide string std::basic_string, std::allocator > PUGIXML_FUNCTION as_wide(const char* str); + std::basic_string, std::allocator > PUGIXML_FUNCTION as_wide(const std::basic_string, std::allocator >& str); #endif // Memory allocation function interface; returns pointer to allocated memory or NULL on failure -- cgit v1.2.3