summaryrefslogtreecommitdiff
path: root/tests/writer_string.cpp
diff options
context:
space:
mode:
authorarseny.kapoulkine@gmail.com <arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>2012-03-06 08:49:58 +0000
committerarseny.kapoulkine@gmail.com <arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>2012-03-06 08:49:58 +0000
commit04629118dbde33fdedfe489119f34912f8e7c124 (patch)
tree1a212f9122d56d1147c64b5c44fa99248e6a21cb /tests/writer_string.cpp
parent72dd6038a23029a0fd537237540f99507dbc361f (diff)
tests: Android compilation fixes
git-svn-id: http://pugixml.googlecode.com/svn/trunk@846 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'tests/writer_string.cpp')
-rw-r--r--tests/writer_string.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/writer_string.cpp b/tests/writer_string.cpp
index 1b94d20..a09678b 100644
--- a/tests/writer_string.cpp
+++ b/tests/writer_string.cpp
@@ -23,12 +23,12 @@ std::string xml_writer_string::as_narrow() const
return contents;
}
-std::wstring xml_writer_string::as_wide() const
+std::basic_string<wchar_t> xml_writer_string::as_wide() const
{
CHECK(contents.size() % sizeof(wchar_t) == 0);
// round-trip pointer through void* to avoid pointer alignment warnings; contents data should be heap allocated => safe to cast
- return std::wstring(static_cast<const wchar_t*>(static_cast<const void*>(contents.data())), contents.size() / sizeof(wchar_t));
+ return std::basic_string<wchar_t>(static_cast<const wchar_t*>(static_cast<const void*>(contents.data())), contents.size() / sizeof(wchar_t));
}
std::basic_string<pugi::char_t> xml_writer_string::as_string() const
@@ -69,7 +69,7 @@ bool test_write_narrow(pugi::xml_node node, unsigned int flags, pugi::xml_encodi
return test_narrow(write_narrow(node, flags, encoding), expected, length);
}
-std::wstring write_wide(pugi::xml_node node, unsigned int flags, pugi::xml_encoding encoding)
+std::basic_string<wchar_t> write_wide(pugi::xml_node node, unsigned int flags, pugi::xml_encoding encoding)
{
xml_writer_string writer;