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

Fix release mode build compilation errors from the prev rev. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2011 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-16 04:23:56 +00:00
parent 1f2daa6459
commit d2767da7b3
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/Utilities/ThreadTools.cpp
View File

@ -271,16 +271,18 @@ void Threading::PersistentThread::_try_virtual_invoke( void (PersistentThread::*
m_except = ex.Clone();
m_except->DiagMsg() = wxsFormat( L"(thread:%s) ", GetName().c_str() ) + m_except->DiagMsg();
}
// ----------------------------------------------------------------------------
// BaseException / std::exception -- same deal as LogicErrors.
//
catch( std::exception& ex )
// Bleh... don't bother with std::exception. std::logic_error and runtime_error should catch
// anything coming out of the core STL libraries anyway.
/*catch( std::exception& ex )
{
throw Exception::BaseException( wxsFormat( L"(thread: %s) STL exception: %s\n\t%s",
GetName().c_str(), fromUTF8( ex.what() ).c_str() )
);
}
}*/
// ----------------------------------------------------------------------------
// BaseException -- same deal as LogicErrors.
//
catch( Exception::BaseException& ex )
{
m_except = ex.Clone();

2
pcsx2/PluginManager.cpp
View File

@ -668,7 +668,7 @@ PluginManager::PluginManager( const wxString (&folders)[PluginId_Count] )
{
const PluginsEnum_t pid = pi->id;
Console.WriteLn( "\tBinding %s\t: %s ", tbl_PluginInfo[pid].shortname, folders[pid].ToUTF8() );
Console.WriteLn( "\tBinding %s\t: %s ", tbl_PluginInfo[pid].shortname, folders[pid].ToUTF8().data() );
if( folders[pid].IsEmpty() )
throw Exception::InvalidArgument( "Empty plugin filename." );

2
pcsx2/gui/MainFrame.h
View File

@ -88,7 +88,7 @@ protected:
static void OnCoreThreadStatusChanged( void* obj, const wxCommandEvent& evt );
static void OnCorePluginStatusChanged( void* obj, const wxCommandEvent& evt );
static void OnSettingsApplied( void* obj, const int& evt );
static void MainEmuFrame::OnSettingsLoadSave( void* obj, const IniInterface& evt );
static void OnSettingsLoadSave( void* obj, const IniInterface& evt );
void LoadSaveRecentIsoList( IniInterface& conf );
void ApplySettings();