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

Replaced std::wstring with std::basic_string<wchar_t> (fixes Android compilation)

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@803 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2011-01-15 10:56:18 +00:00
parent 175b3ff633
commit 81e4707fca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pugixml.cpp
View File

@ -1324,7 +1324,7 @@ namespace
return result; return result;
} }
std::wstring as_wide_impl(const char* str, size_t size) std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
{ {
const uint8_t* data = reinterpret_cast<const uint8_t*>(str); const uint8_t* data = reinterpret_cast<const uint8_t*>(str);
@ -1332,7 +1332,7 @@ namespace
size_t length = utf_decoder<wchar_counter>::decode_utf8_block(data, size, 0); size_t length = utf_decoder<wchar_counter>::decode_utf8_block(data, size, 0);
// allocate resulting string // allocate resulting string
std::wstring result; std::basic_string<wchar_t> result;
result.resize(length); result.resize(length);
// second pass: convert to wchar_t // second pass: convert to wchar_t
@ -4744,19 +4744,19 @@ namespace pugi
return as_utf8_impl(str, wcslen(str)); return as_utf8_impl(str, wcslen(str));
} }
std::string PUGIXML_FUNCTION as_utf8(const std::wstring& str) std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
{ {
return as_utf8_impl(str.c_str(), str.size()); return as_utf8_impl(str.c_str(), str.size());
} }
std::wstring PUGIXML_FUNCTION as_wide(const char* str) std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
{ {
assert(str); assert(str);
return as_wide_impl(str, strlen(str)); return as_wide_impl(str, strlen(str));
} }
std::wstring PUGIXML_FUNCTION as_wide(const std::string& str) std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
{ {
return as_wide_impl(str.c_str(), str.size()); return as_wide_impl(str.c_str(), str.size());
} }