diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-03-19 21:53:09 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-03-19 21:53:09 -0500 |
| commit | d11679a06e6a992216148fd2ce1730c9912c8564 (patch) | |
| tree | 843eb3b17cf8fe6c72af7e32d5554ce35ce785d6 /Source/Core/Common | |
| parent | edd9d0e0ef6898a0528ac6389e93e9fca6132ff6 (diff) | |
Android mega commit of trash.
Diffstat (limited to 'Source/Core/Common')
| -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) |