From 7e9cf5a340bf1b70518ed02040ee4c219a3ee002 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Mon, 27 Dec 2010 10:05:59 +0000 Subject: [PATCH] Fix a few non-POD type warnings. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4154 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/SysState.cpp | 4 ++-- pcsx2/ps2/BiosTools.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp index 26cc5c0968..de1b945f56 100644 --- a/pcsx2/gui/SysState.cpp +++ b/pcsx2/gui/SysState.cpp @@ -97,7 +97,7 @@ void MemorySavestateEntry::FreezeIn( pxInputStream& reader ) const if (entrySize < expectedSize) { Console.WriteLn( Color_Yellow, " '%s' is incomplete (expected 0x%x bytes, loading only 0x%x bytes)", - GetFilename(), expectedSize, entrySize ); + GetFilename().c_str(), expectedSize, entrySize ); } uint copylen = std::min(entrySize, expectedSize); @@ -581,7 +581,7 @@ protected: if (SavestateEntries[i]->IsRequired()) { throwIt = true; - Console.WriteLn( Color_Red, " ... not found '%s'!", SavestateEntries[i]->GetFilename() ); + Console.WriteLn( Color_Red, " ... not found '%s'!", SavestateEntries[i]->GetFilename().c_str() ); } } diff --git a/pcsx2/ps2/BiosTools.cpp b/pcsx2/ps2/BiosTools.cpp index 99f5cb1256..cbe8b6c4e1 100644 --- a/pcsx2/ps2/BiosTools.cpp +++ b/pcsx2/ps2/BiosTools.cpp @@ -216,7 +216,7 @@ static void LoadExtraRom( const wxChar* ext, u8 (&dest)[_size] ) // still work fine. Console.Warning(L"BIOS Warning: %s could not be read (permission denied?)", ext); - Console.Indent().WriteLn(L"Details: %s", ex.FormatDiagnosticMessage()); + Console.Indent().WriteLn(L"Details: %s", ex.FormatDiagnosticMessage().c_str()); Console.Indent().WriteLn(L"File size: %llu", filesize); } }