From d11679a06e6a992216148fd2ce1730c9912c8564 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 19 Mar 2013 21:53:09 -0500 Subject: Android mega commit of trash. --- Source/Core/Common/Src/StringUtil.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/Core/Common/Src/StringUtil.cpp') 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& 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) -- cgit v1.2.3