From ef6bdf674f556c0ce9df383a3dc2e8bdc7483a5f Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 7 Apr 2015 22:15:21 +0200 Subject: Common: Remove TLS usage in GetLastErrorMsg Just return std::string as this code isn't performance critical. --- Source/Core/Common/MemoryUtil.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/Common/MemoryUtil.cpp') 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() -- cgit v1.2.3