ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wxIsoFile: final annoying compilation error fixed. Just needs a little linux-side testing now. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxIsoFile@3945 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-10-19 09:51:57 +00:00
parent e30892cf34
commit 5ba7b0650d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/Utilities/Exceptions.cpp
View File

@ -169,24 +169,20 @@ Exception::RuntimeError::RuntimeError( const std::runtime_error& ex, const wxStr
{ {
IsSilent = false; IsSilent = false;
const wxString msg( pxsFmt( L"STL Runtime Error%s: %s", SetDiagMsg( pxsFmt( L"STL Runtime Error%s: %s",
(prefix.IsEmpty() ? prefix.c_str() : pxsFmt(L" (%s)", prefix.c_str()).c_str()), (prefix.IsEmpty() ? prefix.c_str() : pxsFmt(L" (%s)", prefix.c_str()).c_str()),
fromUTF8( ex.what() ).c_str() fromUTF8( ex.what() ).c_str()
) ); ) );
SetDiagMsg( msg );
} }
Exception::RuntimeError::RuntimeError( const std::exception& ex, const wxString& prefix ) Exception::RuntimeError::RuntimeError( const std::exception& ex, const wxString& prefix )
{ {
IsSilent = false; IsSilent = false;
const wxString msg( pxsFmt( L"STL Exception%s: %s", SetDiagMsg( pxsFmt( L"STL Exception%s: %s",
(prefix.IsEmpty() ? prefix.c_str() : pxsFmt(L" (%s)", prefix.c_str()).c_str()), (prefix.IsEmpty() ? prefix.c_str() : pxsFmt(L" (%s)", prefix.c_str()).c_str()),
fromUTF8( ex.what() ).c_str() fromUTF8( ex.what() ).c_str()
) ); ) );
SetDiagMsg( msg );
} }
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------