diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-19 10:00:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 10:00:48 -0700 |
| commit | bbc31ba6afdd56194d36fc4c99e0e07f7499fe8a (patch) | |
| tree | bc1017dd2ba9d2b7e540aeb13a4af1368b2bde86 /src/common/common_funcs.h | |
| parent | 130a02f330e18bf9d519c8d2be18c9dd2539e169 (diff) | |
| parent | e0b8a35937e5c93ce661e9a947bd2b5f68aa810f (diff) | |
Merge pull request #709 from lioncash/thread-local
common/misc: Deduplicate code in GetLastErrorMsg()
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 @@ #pragma once +#include <string> + #if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) #include <cstdlib> // for exit #endif @@ -90,7 +92,7 @@ __declspec(dllimport) void __stdcall DebugBreak(void); // Call directly after the command or use the error num. // This function might change the error code. // Defined in Misc.cpp. -const char* GetLastErrorMsg(); +std::string GetLastErrorMsg(); namespace Common { |