From bb64ecfcf2ad5b618e4385acad1a34a256fc0f5c Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sun, 22 Nov 2009 10:31:36 +0000 Subject: [PATCH] Attack of the non-POD type objects. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2236 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/src/Utilities/ThreadTools.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/Utilities/ThreadTools.cpp b/common/src/Utilities/ThreadTools.cpp index a6427b6951..25737303ce 100644 --- a/common/src/Utilities/ThreadTools.cpp +++ b/common/src/Utilities/ThreadTools.cpp @@ -654,13 +654,13 @@ __forceinline s32 Threading::AtomicDecrement( volatile s32& Target ) // -------------------------------------------------------------------------------------- wxString Exception::BaseThreadError::FormatDiagnosticMessage() const -{ - return wxsFormat( m_message_diag, (m_thread==NULL) ? L"Null Thread Object" : m_thread->GetName() ); +{ + return wxsFormat( m_message_diag, (m_thread==NULL) ? L"Null Thread Object" : m_thread->GetName().c_str()); } wxString Exception::BaseThreadError::FormatDisplayMessage() const -{ - return wxsFormat( m_message_user, (m_thread==NULL) ? _("Null Thread Object") : m_thread->GetName() ); +{ + return wxsFormat( m_message_user, (m_thread==NULL) ? L"Null Thread Object" : m_thread->GetName().c_str()); } PersistentThread& Exception::BaseThreadError::Thread()