diff options
| author | 2018-07-19 09:03:30 -0400 | |
|---|---|---|
| committer | 2018-07-19 09:15:38 -0400 | |
| commit | e0b8a35937e5c93ce661e9a947bd2b5f68aa810f (patch) | |
| tree | 76438b697194444d6a2a16d3bd885758abd8bccd /src/common/common_funcs.h | |
| parent | Merge pull request #700 from bunnei/update-dynarmic (diff) | |
| download | yuzu-e0b8a35937e5c93ce661e9a947bd2b5f68aa810f.tar.gz yuzu-e0b8a35937e5c93ce661e9a947bd2b5f68aa810f.tar.xz yuzu-e0b8a35937e5c93ce661e9a947bd2b5f68aa810f.zip | |
common/misc: Deduplicate code in GetLastErrorMsg()
Android and macOS have supported thread_local for quite a while, but
most importantly is that we don't even really need it. Instead of using
a thread-local buffer, we can just return a non-static buffer as a
std::string, avoiding the need for that quality entirely.
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 995938d0b..042c2c2aa 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -4,6 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <string> | ||
| 8 | |||
| 7 | #if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) | 9 | #if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) |
| 8 | #include <cstdlib> // for exit | 10 | #include <cstdlib> // for exit |
| 9 | #endif | 11 | #endif |
| @@ -90,7 +92,7 @@ __declspec(dllimport) void __stdcall DebugBreak(void); | |||
| 90 | // Call directly after the command or use the error num. | 92 | // Call directly after the command or use the error num. |
| 91 | // This function might change the error code. | 93 | // This function might change the error code. |
| 92 | // Defined in Misc.cpp. | 94 | // Defined in Misc.cpp. |
| 93 | const char* GetLastErrorMsg(); | 95 | std::string GetLastErrorMsg(); |
| 94 | 96 | ||
| 95 | namespace Common { | 97 | namespace Common { |
| 96 | 98 | ||