diff options
| author | degasus <wickmarkus@web.de> | 2015-04-07 22:15:21 +0200 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2015-04-07 22:42:21 +0200 |
| commit | ef6bdf674f556c0ce9df383a3dc2e8bdc7483a5f (patch) | |
| tree | a38461de57b18a7db4d0799b542ef69ba522def6 /Source/Core/Common/MemoryUtil.cpp | |
| parent | 4796dc80bfa3b6431032492d88322ebc11beec32 (diff) | |
Common: Remove TLS usage in GetLastErrorMsg
Just return std::string as this code isn't performance critical.
Diffstat (limited to 'Source/Core/Common/MemoryUtil.cpp')
| -rw-r--r-- | Source/Core/Common/MemoryUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index 8ab189854f..db60a475ed 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -145,7 +145,7 @@ void FreeMemoryPages(void* ptr, size_t size) #endif if (error_occurred) - PanicAlert("FreeMemoryPages failed!\n%s", GetLastErrorMsg()); + PanicAlert("FreeMemoryPages failed!\n%s", GetLastErrorMsg().c_str()); } } @@ -177,7 +177,7 @@ void ReadProtectMemory(void* ptr, size_t size) #endif if (error_occurred) - PanicAlert("ReadProtectMemory failed!\n%s", GetLastErrorMsg()); + PanicAlert("ReadProtectMemory failed!\n%s", GetLastErrorMsg().c_str()); } void WriteProtectMemory(void* ptr, size_t size, bool allowExecute) @@ -196,7 +196,7 @@ void WriteProtectMemory(void* ptr, size_t size, bool allowExecute) #endif if (error_occurred) - PanicAlert("WriteProtectMemory failed!\n%s", GetLastErrorMsg()); + PanicAlert("WriteProtectMemory failed!\n%s", GetLastErrorMsg().c_str()); } void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute) @@ -215,7 +215,7 @@ void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute) #endif if (error_occurred) - PanicAlert("UnWriteProtectMemory failed!\n%s", GetLastErrorMsg()); + PanicAlert("UnWriteProtectMemory failed!\n%s", GetLastErrorMsg().c_str()); } std::string MemUsage() |
