diff options
| author | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
|---|---|---|
| committer | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
| commit | 748be565b8df535ef558e74b38cd0f4d615f8a21 (patch) | |
| tree | b151efee0a87e99125f2401325a9bddecf84fc73 /Source/Core/Common/StringUtil.cpp | |
| parent | cf17fccdd3093a1b8476b10183b1c4bde36da74d (diff) | |
| parent | ce493b897d6d3735c930a8465cc0c26bbe5feb86 (diff) | |
Merge remote-tracking branch 'dolphin-emu/master' into gameinis
Diffstat (limited to 'Source/Core/Common/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/StringUtil.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 903131a5d3..9fdbd9f801 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -14,9 +14,11 @@ #include <string> #include <vector> +#include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #ifdef _WIN32 #include <Windows.h> @@ -113,7 +115,7 @@ std::string StringFromFormat(const char* format, ...) va_start(args, format); std::string res = StringFromFormatV(format, args); va_end(args); - return std::move(res); + return res; } std::string StringFromFormatV(const char* format, va_list args) @@ -139,7 +141,7 @@ std::string StringFromFormatV(const char* format, va_list args) std::string temp = buf; free(buf); #endif - return std::move(temp); + return temp; } // For Debugging. Read out an u8 array. |
