From 04629118dbde33fdedfe489119f34912f8e7c124 Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine@gmail.com" Date: Tue, 6 Mar 2012 08:49:58 +0000 Subject: tests: Android compilation fixes git-svn-id: http://pugixml.googlecode.com/svn/trunk@846 99668b35-9821-0410-8761-19e4c4f06640 --- tests/writer_string.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/writer_string.cpp') 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 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(static_cast(contents.data())), contents.size() / sizeof(wchar_t)); + return std::basic_string(static_cast(static_cast(contents.data())), contents.size() / sizeof(wchar_t)); } std::basic_string 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 write_wide(pugi::xml_node node, unsigned int flags, pugi::xml_encoding encoding) { xml_writer_string writer; -- cgit v1.2.3