summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-07-14 17:12:02 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-07-14 17:12:02 -0400
commit8ca0f872f2f3cd026788c3ea28c3a00f5d407033 (patch)
treebad062c7517104eb635236fe9c6d5fa8ae47aa04 /indra
parent624c3f1a8e503a3a577b81e06b0ae3344e8ede17 (diff)
wstring_to_utf8str() accepts LLWString rather than std::wstring.
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/tests/llsdserialize_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 93261fa306..e61e6b9460 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -101,7 +101,8 @@ std::string native_to_string(const std::string& in)
inline
std::string native_to_string(const std::wstring& in)
{
- return wstring_to_utf8str(in);
+ // So actually, wstring_to_utf8str() accepts LLWString rather than std::wstring...
+ return wstring_to_utf8str(LLWString(in.begin(), in.end()));
}
// Create a Python script file with specified content "somewhere in the