From 965c423f1c097414ebde6005a120352a7afad5ae Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 8 May 2018 13:55:07 +0200 Subject: [PATCH] StringUtil.h: Move ThousandSeparate down It calls UTF16ToUTF8 on Windows, so it should come after UTF16ToUTF8. --- Source/Core/Common/StringUtil.h | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h index ef84fb6dcd..2e6089ef14 100644 --- a/Source/Core/Common/StringUtil.h +++ b/Source/Core/Common/StringUtil.h @@ -41,25 +41,6 @@ std::string ArrayToString(const u8* data, u32 size, int line_len = 20, bool spac std::string StripSpaces(const std::string& s); std::string StripQuotes(const std::string& s); -// Thousand separator. Turns 12345678 into 12,345,678 -template -std::string ThousandSeparate(I value, int spaces = 0) -{ -#ifdef _WIN32 - std::wostringstream stream; -#else - std::ostringstream stream; -#endif - - stream << std::setw(spaces) << value; - -#ifdef _WIN32 - return UTF16ToUTF8(stream.str()); -#else - return stream.str(); -#endif -} - std::string StringFromBool(bool value); bool TryParse(const std::string& str, bool* output); @@ -158,3 +139,22 @@ inline std::string UTF8ToTStr(const std::string& str) #endif #endif + +// Thousand separator. Turns 12345678 into 12,345,678 +template +std::string ThousandSeparate(I value, int spaces = 0) +{ +#ifdef _WIN32 + std::wostringstream stream; +#else + std::ostringstream stream; +#endif + + stream << std::setw(spaces) << value; + +#ifdef _WIN32 + return UTF16ToUTF8(stream.str()); +#else + return stream.str(); +#endif +}