diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-14 23:36:00 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-14 23:36:00 -0500 |
| commit | 7772f0d071cd8f1c6b44036207b4e6f9da4d9bf7 (patch) | |
| tree | 6dbe1cff255abe6e35f51910df73daf5eecbec88 /Source/Core/Common/Src/StringUtil.cpp | |
| parent | 8a9fcd3014a4aee23b6fb7008a02679f8bf96200 (diff) | |
| parent | 44bbb54a62a58be4ad39caf6ba55ff98244223d5 (diff) | |
Merge branch 'Android-trash' since it is no longer quite so trashy.
Diffstat (limited to 'Source/Core/Common/Src/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/Src/StringUtil.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 43c4aebf12..855a8c2e30 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -437,8 +437,7 @@ std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input) std::string result; #if defined(ANDROID) - result = "Not implemented on Android!"; - + result = (char*)input.c_str(); #else iconv_t const conv_desc = iconv_open("UTF-8", fromcode); if ((iconv_t)-1 == conv_desc) |
