diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2018-05-08 14:31:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-08 14:31:57 +0200 |
| commit | f0e6fcfb071963a57bcf7f7d06d97e4c97ffb229 (patch) | |
| tree | 11c960994b3343da5713c930803c89ef7e5b25d2 | |
| parent | 90f869e9408a1b8509bafb8800998e439bb3d9af (diff) | |
| parent | 965c423f1c097414ebde6005a120352a7afad5ae (diff) | |
Merge pull request #6785 from JosJuice/stringutil-order
StringUtil.h: Move ThousandSeparate down
| -rw-r--r-- | Source/Core/Common/StringUtil.h | 38 |
1 files 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 <typename I> -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 <typename I> +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 +} |
