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

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

@ -99,7 +99,7 @@ Threading::PersistentThread::~PersistentThread() throw()
// a safe thing to do since typically threads are acquiring and releasing locks // a safe thing to do since typically threads are acquiring and releasing locks
// and semaphores all the time. And terminating threads isn't really cross-platform // and semaphores all the time. And terminating threads isn't really cross-platform
// either so let's just not bother. // either so let's just not bother.
// Additionally since this is a destructor most of our derived class info is lost, // Additionally since this is a destructor most of our derived class info is lost,
// so we can't allow for customized deadlock handlers, least not in any useful // so we can't allow for customized deadlock handlers, least not in any useful
// context. So let's just log the condition and move on. // context. So let's just log the condition and move on.
@ -271,16 +271,18 @@ void Threading::PersistentThread::_try_virtual_invoke( void (PersistentThread::*
m_except = ex.Clone(); m_except = ex.Clone();
m_except->DiagMsg() = wxsFormat( L"(thread:%s) ", GetName().c_str() ) + m_except->DiagMsg(); m_except->DiagMsg() = wxsFormat( L"(thread:%s) ", GetName().c_str() ) + m_except->DiagMsg();
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// BaseException / std::exception -- same deal as LogicErrors. // 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 ) /*catch( std::exception& ex )
{ {
throw Exception::BaseException( wxsFormat( L"(thread: %s) STL exception: %s\n\t%s", throw Exception::BaseException( wxsFormat( L"(thread: %s) STL exception: %s\n\t%s",
GetName().c_str(), fromUTF8( ex.what() ).c_str() ) GetName().c_str(), fromUTF8( ex.what() ).c_str() )
); );
} }*/
// ----------------------------------------------------------------------------
// BaseException -- same deal as LogicErrors.
//
catch( Exception::BaseException& ex ) catch( Exception::BaseException& ex )
{ {
m_except = ex.Clone(); m_except = ex.Clone();
@ -548,7 +550,7 @@ void Threading::Semaphore::Wait()
if( !wxThread::IsMain() || (wxTheApp == NULL) ) if( !wxThread::IsMain() || (wxTheApp == NULL) )
{ {
WaitRaw(); WaitRaw();
} }
else if( _WaitGui_RecursionGuard() ) else if( _WaitGui_RecursionGuard() )
{ {
if( !WaitRaw(ts_waitgui_deadlock) ) // default is 4 seconds if( !WaitRaw(ts_waitgui_deadlock) ) // default is 4 seconds

8
pcsx2/PluginManager.cpp
View File

@ -668,7 +668,7 @@ PluginManager::PluginManager( const wxString (&folders)[PluginId_Count] )
{ {
const PluginsEnum_t pid = pi->id; 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() ) if( folders[pid].IsEmpty() )
throw Exception::InvalidArgument( "Empty plugin filename." ); throw Exception::InvalidArgument( "Empty plugin filename." );
@ -747,7 +747,7 @@ PluginManager::~PluginManager() throw()
} }
DESTRUCTOR_CATCHALL DESTRUCTOR_CATCHALL
// All library unloading done automatically. // All library unloading done automatically.
if( g_plugins == this ) if( g_plugins == this )
g_plugins = NULL; g_plugins = NULL;
} }
@ -1081,13 +1081,13 @@ void PluginManager::Freeze( PluginsEnum_t pid, SaveStateBase& state )
// older versions of a different size... or could give different sizes depending // older versions of a different size... or could give different sizes depending
// on the status of the plugin when loading, so let's ignore it. // on the status of the plugin when loading, so let's ignore it.
} }
fP.size = fsize; fP.size = fsize;
if( fP.size == 0 ) return; if( fP.size == 0 ) return;
state.PrepBlock( fP.size ); state.PrepBlock( fP.size );
fP.data = (s8*)state.GetBlockPtr(); fP.data = (s8*)state.GetBlockPtr();
if( state.IsSaving() ) if( state.IsSaving() )
{ {
if( !DoFreeze(pid, FREEZE_SAVE, &fP) ) if( !DoFreeze(pid, FREEZE_SAVE, &fP) )

12
pcsx2/gui/MainFrame.h
View File

@ -1,6 +1,6 @@
/* PCSX2 - PS2 Emulator for PCs /* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 PCSX2 Dev Team * Copyright (C) 2002-2009 PCSX2 Dev Team
* *
* PCSX2 is free software: you can redistribute it and/or modify it under the terms * PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found- * of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version. * ation, either version 3 of the License, or (at your option) any later version.
@ -29,7 +29,7 @@ protected:
public: public:
GSFrame(wxWindow* parent, const wxString& title); GSFrame(wxWindow* parent, const wxString& title);
virtual ~GSFrame() throw(); virtual ~GSFrame() throw();
protected: protected:
void InitDefaultAccelerators(); void InitDefaultAccelerators();
void OnCloseWindow( wxCloseEvent& evt ); void OnCloseWindow( wxCloseEvent& evt );
@ -63,7 +63,7 @@ protected:
wxMenu& m_SaveStatesSubmenu; wxMenu& m_SaveStatesSubmenu;
wxMenuItem& m_MenuItem_Console; wxMenuItem& m_MenuItem_Console;
CmdEvt_ListenerBinding m_Listener_CoreThreadStatus; CmdEvt_ListenerBinding m_Listener_CoreThreadStatus;
CmdEvt_ListenerBinding m_Listener_CorePluginStatus; CmdEvt_ListenerBinding m_Listener_CorePluginStatus;
EventListenerBinding<int> m_Listener_SettingsApplied; EventListenerBinding<int> m_Listener_SettingsApplied;
@ -83,13 +83,13 @@ public:
void UpdateIsoSrcFile(); void UpdateIsoSrcFile();
void UpdateIsoSrcSelection(); void UpdateIsoSrcSelection();
void ReloadRecentLists(); void ReloadRecentLists();
protected: protected:
static void OnCoreThreadStatusChanged( void* obj, const wxCommandEvent& evt ); static void OnCoreThreadStatusChanged( void* obj, const wxCommandEvent& evt );
static void OnCorePluginStatusChanged( void* obj, const wxCommandEvent& evt ); static void OnCorePluginStatusChanged( void* obj, const wxCommandEvent& evt );
static void OnSettingsApplied( void* obj, const int& 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 LoadSaveRecentIsoList( IniInterface& conf );
void ApplySettings(); void ApplySettings();
void ApplyCoreStatus(); void ApplyCoreStatus();