diff --git a/pcsx2/CDVD/InputIsoFile.cpp b/pcsx2/CDVD/InputIsoFile.cpp index e0012db3bc..cef7d9333f 100644 --- a/pcsx2/CDVD/InputIsoFile.cpp +++ b/pcsx2/CDVD/InputIsoFile.cpp @@ -162,7 +162,7 @@ InputIsoFile::InputIsoFile() _init(); } -InputIsoFile::~InputIsoFile() throw() +InputIsoFile::~InputIsoFile() { Close(); } diff --git a/pcsx2/CDVD/IsoFileFormats.h b/pcsx2/CDVD/IsoFileFormats.h index 2100ef168e..082bde3498 100644 --- a/pcsx2/CDVD/IsoFileFormats.h +++ b/pcsx2/CDVD/IsoFileFormats.h @@ -67,7 +67,7 @@ protected: public: InputIsoFile(); - virtual ~InputIsoFile() throw(); + virtual ~InputIsoFile(); bool IsOpened() const; @@ -121,7 +121,7 @@ protected: public: OutputIsoFile(); - virtual ~OutputIsoFile() throw(); + virtual ~OutputIsoFile(); bool IsOpened() const; diff --git a/pcsx2/CDVD/OutputIsoFile.cpp b/pcsx2/CDVD/OutputIsoFile.cpp index 6d453dcd7f..e77fa96f0c 100644 --- a/pcsx2/CDVD/OutputIsoFile.cpp +++ b/pcsx2/CDVD/OutputIsoFile.cpp @@ -34,7 +34,7 @@ OutputIsoFile::OutputIsoFile() _init(); } -OutputIsoFile::~OutputIsoFile() throw() +OutputIsoFile::~OutputIsoFile() { Close(); } diff --git a/pcsx2/GS.h b/pcsx2/GS.h index 577f53e879..4ef84f9901 100644 --- a/pcsx2/GS.h +++ b/pcsx2/GS.h @@ -354,7 +354,7 @@ public: public: SysMtgsThread(); - virtual ~SysMtgsThread() throw(); + virtual ~SysMtgsThread(); // Waits for the GS to empty out the entire ring buffer contents. void WaitGS(bool syncRegs=true, bool weakWait=false, bool isMTVU=false); diff --git a/pcsx2/GameDatabase.cpp b/pcsx2/GameDatabase.cpp index aba6cc8003..4cce4ac893 100644 --- a/pcsx2/GameDatabase.cpp +++ b/pcsx2/GameDatabase.cpp @@ -30,7 +30,7 @@ BaseGameDatabaseImpl::BaseGameDatabaseImpl() m_BlockTable.push_back(NULL); } -BaseGameDatabaseImpl::~BaseGameDatabaseImpl() throw() +BaseGameDatabaseImpl::~BaseGameDatabaseImpl() { for(uint blockidx=0; blockidx<=m_BlockTableWritePos; ++blockidx) { diff --git a/pcsx2/GameDatabase.h b/pcsx2/GameDatabase.h index 18de35d6b4..76453c5b4f 100644 --- a/pcsx2/GameDatabase.h +++ b/pcsx2/GameDatabase.h @@ -206,7 +206,7 @@ protected: public: BaseGameDatabaseImpl(); - virtual ~BaseGameDatabaseImpl() throw(); + virtual ~BaseGameDatabaseImpl(); wxString getBaseKey() const { return m_baseKey; } void setBaseKey( const wxString& key ) { m_baseKey = key; } diff --git a/pcsx2/MTGS.cpp b/pcsx2/MTGS.cpp index 3e774308e1..e0658c01ea 100644 --- a/pcsx2/MTGS.cpp +++ b/pcsx2/MTGS.cpp @@ -80,7 +80,7 @@ void SysMtgsThread::OnStart() _parent::OnStart(); } -SysMtgsThread::~SysMtgsThread() throw() +SysMtgsThread::~SysMtgsThread() { try { _parent::Cancel(); @@ -250,7 +250,7 @@ class RingBufferLock { m_mtgs(mtgs) { m_mtgs.m_RingBufferIsBusy.store(true, std::memory_order_relaxed); } - virtual ~RingBufferLock() throw() { + virtual ~RingBufferLock() { m_mtgs.m_RingBufferIsBusy.store(false, std::memory_order_relaxed); } void Acquire() { diff --git a/pcsx2/MTVU.cpp b/pcsx2/MTVU.cpp index 13c5e5f516..e21e6a5d75 100644 --- a/pcsx2/MTVU.cpp +++ b/pcsx2/MTVU.cpp @@ -67,7 +67,7 @@ VU_Thread::VU_Thread(BaseVUmicroCPU*& _vuCPU, VURegs& _vuRegs) : Reset(); } -VU_Thread::~VU_Thread() throw() +VU_Thread::~VU_Thread() { try { pxThread::Cancel(); diff --git a/pcsx2/MTVU.h b/pcsx2/MTVU.h index 6435a06343..4f4cecd68f 100644 --- a/pcsx2/MTVU.h +++ b/pcsx2/MTVU.h @@ -49,7 +49,7 @@ public: __aligned(4) u32 vuCycleIdx; // Used for VU cycle stealing hack VU_Thread(BaseVUmicroCPU*& _vuCPU, VURegs& _vuRegs); - virtual ~VU_Thread() throw(); + virtual ~VU_Thread(); void Reset(); diff --git a/pcsx2/OutputIsoFile.cpp b/pcsx2/OutputIsoFile.cpp index 7c093113a6..a712883e74 100644 --- a/pcsx2/OutputIsoFile.cpp +++ b/pcsx2/OutputIsoFile.cpp @@ -35,7 +35,7 @@ OutputIsoFile::OutputIsoFile() _init(); } -OutputIsoFile::~OutputIsoFile() throw() +OutputIsoFile::~OutputIsoFile() { Close(); } diff --git a/pcsx2/PluginManager.cpp b/pcsx2/PluginManager.cpp index 70a6164cf0..021f1a9d7f 100644 --- a/pcsx2/PluginManager.cpp +++ b/pcsx2/PluginManager.cpp @@ -1111,7 +1111,7 @@ void SysCorePlugins::PluginStatus_t::BindOptional( PluginsEnum_t pid ) // SysCorePlugins Implementations // ===================================================================================== -SysCorePlugins::~SysCorePlugins() throw() +SysCorePlugins::~SysCorePlugins() { try { diff --git a/pcsx2/Plugins.h b/pcsx2/Plugins.h index 3ef8ac0876..ce7e1cb273 100644 --- a/pcsx2/Plugins.h +++ b/pcsx2/Plugins.h @@ -324,7 +324,7 @@ protected: } PluginStatus_t( PluginsEnum_t _pid, const wxString& srcfile ); - virtual ~PluginStatus_t() throw() { delete Lib; } + virtual ~PluginStatus_t() { delete Lib; } protected: void BindCommon( PluginsEnum_t pid ); @@ -345,7 +345,7 @@ public: // hack until we unsuck plugins... public: SysCorePlugins(); - virtual ~SysCorePlugins() throw(); + virtual ~SysCorePlugins(); virtual void Load( PluginsEnum_t pid, const wxString& srcfile ); virtual void Load( const wxString (&folders)[PluginId_Count] ); diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index 4f4bf1a7f6..70e19fb6f4 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -41,7 +41,7 @@ RecompiledCodeReserve::RecompiledCodeReserve( const wxString& name, uint defComm m_prot_mode = PageAccess_Any(); } -RecompiledCodeReserve::~RecompiledCodeReserve() throw() +RecompiledCodeReserve::~RecompiledCodeReserve() { _termProfiler(); } @@ -274,7 +274,7 @@ public: ScopedExcept ExThrown; CpuInitializer(); - virtual ~CpuInitializer() throw(); + virtual ~CpuInitializer(); bool IsAvailable() const { @@ -315,7 +315,7 @@ CpuInitializer< CpuType >::CpuInitializer() } template< typename CpuType > -CpuInitializer< CpuType >::~CpuInitializer() throw() +CpuInitializer< CpuType >::~CpuInitializer() { try { if (MyCpu) @@ -362,7 +362,7 @@ SysMainMemory::SysMainMemory() { } -SysMainMemory::~SysMainMemory() throw() +SysMainMemory::~SysMainMemory() { try { ReleaseAll(); @@ -521,7 +521,7 @@ void SysCpuProviderPack::CleanupMess() throw() DESTRUCTOR_CATCHALL } -SysCpuProviderPack::~SysCpuProviderPack() throw() +SysCpuProviderPack::~SysCpuProviderPack() { CleanupMess(); } diff --git a/pcsx2/System.h b/pcsx2/System.h index c6fe990700..456d0de20c 100644 --- a/pcsx2/System.h +++ b/pcsx2/System.h @@ -103,7 +103,7 @@ protected: public: SysMainMemory(); - virtual ~SysMainMemory() throw(); + virtual ~SysMainMemory(); virtual void ReserveAll(); virtual void CommitAll(); @@ -119,7 +119,7 @@ class SysAllocVM { public: SysAllocVM(); - virtual ~SysAllocVM() throw(); + virtual ~SysAllocVM(); protected: void CleanupMess() throw(); @@ -138,7 +138,7 @@ public: std::unique_ptr CpuProviders; SysCpuProviderPack(); - virtual ~SysCpuProviderPack() throw(); + virtual ~SysCpuProviderPack(); void ApplyConfig() const; #ifndef DISABLE_SVU diff --git a/pcsx2/System/RecTypes.h b/pcsx2/System/RecTypes.h index 906f282dc5..6e35db5c6a 100644 --- a/pcsx2/System/RecTypes.h +++ b/pcsx2/System/RecTypes.h @@ -32,7 +32,7 @@ protected: public: RecompiledCodeReserve( const wxString& name=wxEmptyString, uint defCommit = 0 ); - virtual ~RecompiledCodeReserve() throw(); + virtual ~RecompiledCodeReserve(); virtual void* Reserve( size_t size, uptr base=0, uptr upper_bounds=0 ); virtual void Reset(); diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp index 9b989da9d9..7a9d28240c 100644 --- a/pcsx2/System/SysCoreThread.cpp +++ b/pcsx2/System/SysCoreThread.cpp @@ -53,7 +53,7 @@ SysCoreThread::SysCoreThread() m_hasActiveMachine = false; } -SysCoreThread::~SysCoreThread() throw() +SysCoreThread::~SysCoreThread() { try { SysCoreThread::Cancel(); diff --git a/pcsx2/System/SysThreads.h b/pcsx2/System/SysThreads.h index c710969295..4872cab339 100644 --- a/pcsx2/System/SysThreads.h +++ b/pcsx2/System/SysThreads.h @@ -180,7 +180,7 @@ protected: public: explicit SysCoreThread(); - virtual ~SysCoreThread() throw(); + virtual ~SysCoreThread(); bool HasPendingStateChangeRequest() const; diff --git a/pcsx2/VUmicro.h b/pcsx2/VUmicro.h index 27cdeb1030..8b5dde3d3d 100644 --- a/pcsx2/VUmicro.h +++ b/pcsx2/VUmicro.h @@ -64,7 +64,7 @@ public: IsInterpreter = false; } - virtual ~BaseCpuProvider() throw() + virtual ~BaseCpuProvider() { try { if( m_Reserved != 0 ) @@ -170,7 +170,7 @@ class InterpVU0 : public BaseVUmicroCPU { public: InterpVU0(); - virtual ~InterpVU0() throw() { Shutdown(); } + virtual ~InterpVU0() { Shutdown(); } const char* GetShortName() const { return "intVU0"; } wxString GetLongName() const { return L"VU0 Interpreter"; } @@ -191,7 +191,7 @@ class InterpVU1 : public BaseVUmicroCPU { public: InterpVU1(); - virtual ~InterpVU1() throw() { Shutdown(); } + virtual ~InterpVU1() { Shutdown(); } const char* GetShortName() const { return "intVU1"; } wxString GetLongName() const { return L"VU1 Interpreter"; } @@ -216,7 +216,7 @@ class recMicroVU0 : public BaseVUmicroCPU { public: recMicroVU0(); - virtual ~recMicroVU0() throw() { Shutdown(); } + virtual ~recMicroVU0() { Shutdown(); } const char* GetShortName() const { return "mVU0"; } wxString GetLongName() const { return L"microVU0 Recompiler"; } @@ -237,7 +237,7 @@ class recMicroVU1 : public BaseVUmicroCPU { public: recMicroVU1(); - virtual ~recMicroVU1() throw() { Shutdown(); } + virtual ~recMicroVU1() { Shutdown(); } const char* GetShortName() const { return "mVU1"; } wxString GetLongName() const { return L"microVU1 Recompiler"; } diff --git a/pcsx2/ZipTools/ThreadedZipTools.h b/pcsx2/ZipTools/ThreadedZipTools.h index 7cc662be3a..553632f761 100644 --- a/pcsx2/ZipTools/ThreadedZipTools.h +++ b/pcsx2/ZipTools/ThreadedZipTools.h @@ -155,7 +155,7 @@ protected: wxString m_final_filename; public: - virtual ~BaseCompressThread() throw(); + virtual ~BaseCompressThread(); BaseCompressThread& SetSource( ArchiveEntryList* srcdata ) { diff --git a/pcsx2/ZipTools/thread_gzip.cpp b/pcsx2/ZipTools/thread_gzip.cpp index 7d1a4ede53..275813a87e 100644 --- a/pcsx2/ZipTools/thread_gzip.cpp +++ b/pcsx2/ZipTools/thread_gzip.cpp @@ -22,7 +22,7 @@ #include "wx/wfstream.h" -BaseCompressThread::~BaseCompressThread() throw() +BaseCompressThread::~BaseCompressThread() { try { _parent::Cancel(); diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h index 58ec47701d..b510886c4c 100644 --- a/pcsx2/gui/App.h +++ b/pcsx2/gui/App.h @@ -242,7 +242,7 @@ public: std::unique_ptr GameDB; pxAppResources(); - virtual ~pxAppResources() throw(); + virtual ~pxAppResources(); }; // -------------------------------------------------------------------------------------- diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp index a778f4f683..e6c538d0b8 100644 --- a/pcsx2/gui/AppCoreThread.cpp +++ b/pcsx2/gui/AppCoreThread.cpp @@ -87,7 +87,7 @@ AppCoreThread::AppCoreThread() : SysCoreThread() m_resetCdvd = false; } -AppCoreThread::~AppCoreThread() throw() +AppCoreThread::~AppCoreThread() { try { _parent::Cancel(); // use parent's, skips thread affinity check. @@ -708,7 +708,7 @@ BaseScopedCoreThread::BaseScopedCoreThread() m_alreadyScoped = false; } -BaseScopedCoreThread::~BaseScopedCoreThread() throw() = default; +BaseScopedCoreThread::~BaseScopedCoreThread() = default; // Allows the object to resume execution upon object destruction. Typically called as the last thing // in the object's scope. Any code prior to this call that causes exceptions will not resume the emulator, @@ -773,7 +773,7 @@ ScopedCoreThreadClose::ScopedCoreThreadClose() ScopedCore_IsFullyClosed = true; } -ScopedCoreThreadClose::~ScopedCoreThreadClose() throw() +ScopedCoreThreadClose::~ScopedCoreThreadClose() { if( m_alreadyScoped ) return; try { @@ -803,7 +803,7 @@ ScopedCoreThreadPause::ScopedCoreThreadPause( BaseSysExecEvent_ScopedCore* abuse ScopedCore_IsPaused = true; } -ScopedCoreThreadPause::~ScopedCoreThreadPause() throw() +ScopedCoreThreadPause::~ScopedCoreThreadPause() { if( m_alreadyScoped ) return; try { diff --git a/pcsx2/gui/AppCoreThread.h b/pcsx2/gui/AppCoreThread.h index 29aff5e4db..33574947fc 100644 --- a/pcsx2/gui/AppCoreThread.h +++ b/pcsx2/gui/AppCoreThread.h @@ -127,7 +127,7 @@ protected: public: AppCoreThread(); - virtual ~AppCoreThread() throw(); + virtual ~AppCoreThread(); void ResetCdvd() { m_resetCdvd = true; } @@ -185,7 +185,7 @@ protected: BaseScopedCoreThread(); public: - virtual ~BaseScopedCoreThread() throw()=0; + virtual ~BaseScopedCoreThread() =0; virtual void AllowResume(); virtual void DisallowResume(); @@ -220,7 +220,7 @@ class ScopedCoreThreadClose : public BaseScopedCoreThread public: ScopedCoreThreadClose(); - virtual ~ScopedCoreThreadClose() throw(); + virtual ~ScopedCoreThreadClose(); void LoadPlugins(); }; @@ -231,7 +231,7 @@ struct ScopedCoreThreadPause : public BaseScopedCoreThread public: ScopedCoreThreadPause( BaseSysExecEvent_ScopedCore* abuse_me=NULL ); - virtual ~ScopedCoreThreadPause() throw(); + virtual ~ScopedCoreThreadPause(); }; struct ScopedCoreThreadPopup : public IScopedCoreThread diff --git a/pcsx2/gui/AppEventListeners.h b/pcsx2/gui/AppEventListeners.h index b825ca229a..318eaf51e6 100644 --- a/pcsx2/gui/AppEventListeners.h +++ b/pcsx2/gui/AppEventListeners.h @@ -98,7 +98,7 @@ class EventListener_CoreThread : public IEventListener_CoreThread { public: EventListener_CoreThread(); - virtual ~EventListener_CoreThread() throw(); + virtual ~EventListener_CoreThread(); }; // -------------------------------------------------------------------------------------- @@ -129,7 +129,7 @@ class EventListener_Plugins : public IEventListener_Plugins { public: EventListener_Plugins(); - virtual ~EventListener_Plugins() throw(); + virtual ~EventListener_Plugins(); }; // -------------------------------------------------------------------------------------- @@ -157,7 +157,7 @@ class EventListener_AppStatus : public IEventListener_AppStatus { public: EventListener_AppStatus(); - virtual ~EventListener_AppStatus() throw(); + virtual ~EventListener_AppStatus(); }; // -------------------------------------------------------------------------------------- diff --git a/pcsx2/gui/AppEventSources.cpp b/pcsx2/gui/AppEventSources.cpp index ac10ad06d0..ae1f14278b 100644 --- a/pcsx2/gui/AppEventSources.cpp +++ b/pcsx2/gui/AppEventSources.cpp @@ -33,7 +33,7 @@ EventListener_CoreThread::EventListener_CoreThread() wxGetApp().AddListener( this ); } -EventListener_CoreThread::~EventListener_CoreThread() throw() +EventListener_CoreThread::~EventListener_CoreThread() { wxGetApp().RemoveListener( this ); } @@ -59,7 +59,7 @@ EventListener_Plugins::EventListener_Plugins() wxGetApp().AddListener( this ); } -EventListener_Plugins::~EventListener_Plugins() throw() +EventListener_Plugins::~EventListener_Plugins() { wxGetApp().RemoveListener( this ); } @@ -86,7 +86,7 @@ EventListener_AppStatus::EventListener_AppStatus() wxGetApp().AddListener( this ); } -EventListener_AppStatus::~EventListener_AppStatus() throw() +EventListener_AppStatus::~EventListener_AppStatus() { wxGetApp().RemoveListener( this ); } diff --git a/pcsx2/gui/AppGameDatabase.h b/pcsx2/gui/AppGameDatabase.h index 4ad44db994..389cea1767 100644 --- a/pcsx2/gui/AppGameDatabase.h +++ b/pcsx2/gui/AppGameDatabase.h @@ -47,7 +47,7 @@ protected: public: AppGameDatabase() {} - virtual ~AppGameDatabase() throw() { + virtual ~AppGameDatabase() { try { Console.WriteLn( "(GameDB) Unloading..." ); } diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index 690655a6c8..0ead3b072f 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -397,7 +397,7 @@ public: { } - virtual ~GameDatabaseLoaderThread() throw() + virtual ~GameDatabaseLoaderThread() { try { _parent::Cancel(); diff --git a/pcsx2/gui/AppRes.cpp b/pcsx2/gui/AppRes.cpp index 8d1239720f..250c912dfd 100644 --- a/pcsx2/gui/AppRes.cpp +++ b/pcsx2/gui/AppRes.cpp @@ -71,7 +71,7 @@ pxAppResources::pxAppResources() { } -pxAppResources::~pxAppResources() throw() = default; +pxAppResources::~pxAppResources() = default; wxMenu& Pcsx2App::GetRecentIsoMenu() { diff --git a/pcsx2/gui/ApplyState.h b/pcsx2/gui/ApplyState.h index 8e80064f08..339d64e089 100644 --- a/pcsx2/gui/ApplyState.h +++ b/pcsx2/gui/ApplyState.h @@ -118,7 +118,7 @@ class BaseApplicableDialog public: BaseApplicableDialog() {} - virtual ~BaseApplicableDialog() throw(); + virtual ~BaseApplicableDialog(); // Must return the same thing as GetNameStatic; a name ideal for use in uniquely // identifying dialogs. (this version is the 'instance' version, which is called @@ -161,7 +161,7 @@ protected: EventListenerHelper_AppStatus m_AppStatusHelper; public: - virtual ~BaseApplicableConfigPanel() throw(); + virtual ~BaseApplicableConfigPanel(); BaseApplicableConfigPanel( wxWindow* parent, wxOrientation orient=wxVERTICAL ); BaseApplicableConfigPanel( wxWindow* parent, wxOrientation orient, const wxString& staticLabel ); @@ -236,7 +236,7 @@ public: const wxBitmap& bitmap = wxNullBitmap ); - virtual ~ApplicableWizardPage() throw() { m_ApplyState.DoCleanup(); } + virtual ~ApplicableWizardPage() { m_ApplyState.DoCleanup(); } virtual bool PrepForApply(); }; diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index d942378398..7266829bae 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -33,7 +33,7 @@ wxDEFINE_EVENT(pxEvt_SetTitleText, wxCommandEvent); wxDEFINE_EVENT(pxEvt_FlushQueue, wxCommandEvent); // C++ requires abstract destructors to exist, even though they're abstract. -PipeRedirectionBase::~PipeRedirectionBase() throw() = default; +PipeRedirectionBase::~PipeRedirectionBase() = default; // ---------------------------------------------------------------------------- // diff --git a/pcsx2/gui/ConsoleLogger.h b/pcsx2/gui/ConsoleLogger.h index c5d8d8ad57..a26f70ea6d 100644 --- a/pcsx2/gui/ConsoleLogger.h +++ b/pcsx2/gui/ConsoleLogger.h @@ -35,7 +35,7 @@ class PipeRedirectionBase DeclareNoncopyableObject( PipeRedirectionBase ); public: - virtual ~PipeRedirectionBase() throw()=0; // abstract destructor, forces abstract class behavior + virtual ~PipeRedirectionBase() =0; // abstract destructor, forces abstract class behavior protected: PipeRedirectionBase() {} @@ -79,7 +79,7 @@ public: { } - ~ConsoleTestThread() throw() + ~ConsoleTestThread() { m_done = true; } diff --git a/pcsx2/gui/CpuUsageProvider.h b/pcsx2/gui/CpuUsageProvider.h index a52c55be5c..b2ed4c2432 100644 --- a/pcsx2/gui/CpuUsageProvider.h +++ b/pcsx2/gui/CpuUsageProvider.h @@ -40,7 +40,7 @@ protected: public: CpuUsageProvider(); - virtual ~CpuUsageProvider() throw(); + virtual ~CpuUsageProvider(); virtual bool IsImplemented() const { return m_Implementation->IsImplemented(); } virtual void UpdateStats() { m_Implementation->UpdateStats(); } diff --git a/pcsx2/gui/CpuUsageProviderLnx.cpp b/pcsx2/gui/CpuUsageProviderLnx.cpp index 82a7d9ab99..0ddea212cf 100644 --- a/pcsx2/gui/CpuUsageProviderLnx.cpp +++ b/pcsx2/gui/CpuUsageProviderLnx.cpp @@ -28,4 +28,4 @@ CpuUsageProvider::CpuUsageProvider() : { } -CpuUsageProvider::~CpuUsageProvider() throw() = default; +CpuUsageProvider::~CpuUsageProvider() = default; diff --git a/pcsx2/gui/CpuUsageProviderMSW.cpp b/pcsx2/gui/CpuUsageProviderMSW.cpp index 8f735e44be..30a6550290 100644 --- a/pcsx2/gui/CpuUsageProviderMSW.cpp +++ b/pcsx2/gui/CpuUsageProviderMSW.cpp @@ -49,7 +49,7 @@ protected: public: CpuUsageProviderMSW(); - virtual ~CpuUsageProviderMSW() throw(); + virtual ~CpuUsageProviderMSW(); bool IsImplemented() const; void UpdateStats(); @@ -156,7 +156,7 @@ CpuUsageProviderMSW::CpuUsageProviderMSW() }*/ } -CpuUsageProviderMSW::~CpuUsageProviderMSW() throw() +CpuUsageProviderMSW::~CpuUsageProviderMSW() { //CoUninitialize(); } @@ -282,6 +282,6 @@ CpuUsageProvider::CpuUsageProvider() : { } -CpuUsageProvider::~CpuUsageProvider() throw() +CpuUsageProvider::~CpuUsageProvider() { } diff --git a/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp b/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp index c28918f8cb..b2364822f0 100644 --- a/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp +++ b/pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp @@ -73,7 +73,7 @@ public: m_apply = m_ok = m_cancel = NULL; } - virtual ~ScopedOkButtonDisabler() throw() + virtual ~ScopedOkButtonDisabler() { if (m_apply) m_apply ->Enable(); if (m_ok) m_ok ->Enable(); @@ -94,7 +94,7 @@ BaseApplicableDialog::BaseApplicableDialog( wxWindow* parent, const wxString& ti Init(); } -BaseApplicableDialog::~BaseApplicableDialog() throw() +BaseApplicableDialog::~BaseApplicableDialog() { m_ApplyState.DoCleanup(); } diff --git a/pcsx2/gui/ExecutorThread.cpp b/pcsx2/gui/ExecutorThread.cpp index eb6adbb092..4c46c092a2 100644 --- a/pcsx2/gui/ExecutorThread.cpp +++ b/pcsx2/gui/ExecutorThread.cpp @@ -182,7 +182,7 @@ struct ScopedThreadCancelDisable pthread_setcancelstate( PTHREAD_CANCEL_DISABLE, &oldstate ); } - ~ScopedThreadCancelDisable() throw() + ~ScopedThreadCancelDisable() { int oldstate; pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, &oldstate ); diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index e77c14fb73..2fbdff5376 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -131,7 +131,7 @@ GSPanel::GSPanel( wxWindow* parent ) Bind(wxEVT_LEFT_DCLICK, &GSPanel::OnLeftDclick, this); } -GSPanel::~GSPanel() throw() +GSPanel::~GSPanel() { //CoreThread.Suspend( false ); // Just in case...! } diff --git a/pcsx2/gui/GSFrame.h b/pcsx2/gui/GSFrame.h index 2b6802bda2..0e46dbcfeb 100644 --- a/pcsx2/gui/GSFrame.h +++ b/pcsx2/gui/GSFrame.h @@ -49,7 +49,7 @@ protected: public: GSPanel( wxWindow* parent ); - virtual ~GSPanel() throw(); + virtual ~GSPanel(); void DoResize(); void DoShowMouse(); diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index 6e509a574b..2c91c0a100 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -533,7 +533,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) AppendKeycodeNamesToMenuOptions(); } -MainEmuFrame::~MainEmuFrame() throw() +MainEmuFrame::~MainEmuFrame() { try { if( m_RestartEmuOnDelete ) diff --git a/pcsx2/gui/MainFrame.h b/pcsx2/gui/MainFrame.h index 5b77a6a82b..27009bf14e 100644 --- a/pcsx2/gui/MainFrame.h +++ b/pcsx2/gui/MainFrame.h @@ -129,7 +129,7 @@ protected: public: MainEmuFrame(wxWindow* parent, const wxString& title); - virtual ~MainEmuFrame() throw(); + virtual ~MainEmuFrame(); void OnLogBoxHidden(); diff --git a/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp b/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp index 4cbc88402e..da14157cfe 100644 --- a/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp +++ b/pcsx2/gui/Panels/BaseApplicableConfigPanel.cpp @@ -147,7 +147,7 @@ IApplyState* BaseApplicableConfigPanel::FindApplyStateManager() const return NULL; } -BaseApplicableConfigPanel::~BaseApplicableConfigPanel() throw() +BaseApplicableConfigPanel::~BaseApplicableConfigPanel() { if( IApplyState* iapp = FindApplyStateManager() ) iapp->GetApplyState().PanelList.remove( this ); diff --git a/pcsx2/gui/Panels/ConfigurationPanels.h b/pcsx2/gui/Panels/ConfigurationPanels.h index ce62b86466..8e3b29bf87 100644 --- a/pcsx2/gui/Panels/ConfigurationPanels.h +++ b/pcsx2/gui/Panels/ConfigurationPanels.h @@ -490,7 +490,7 @@ namespace Panels DirPickerPanel* m_FolderPicker; public: - virtual ~ThemeSelectorPanel() throw(); + virtual ~ThemeSelectorPanel(); ThemeSelectorPanel( wxWindow* parent ); protected: @@ -554,7 +554,7 @@ namespace Panels PluginSelectorPanel& m_master; ScopedBusyCursor m_hourglass; public: - virtual ~EnumThread() throw() + virtual ~EnumThread() { try { pxThread::Cancel(); @@ -617,7 +617,7 @@ namespace Panels std::unique_ptr m_EnumeratorThread; public: - virtual ~PluginSelectorPanel() throw(); + virtual ~PluginSelectorPanel(); PluginSelectorPanel( wxWindow* parent ); void CancelRefresh(); // used from destructor, stays non-virtual diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index 1a94d0e3ad..1ce3925332 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -370,7 +370,7 @@ enum McdMenuId Panels::MemoryCardListPanel_Simple* g_uglyPanel=NULL; void g_uglyFunc(){if (g_uglyPanel) g_uglyPanel->OnChangedListSelection();} -Panels::MemoryCardListPanel_Simple::~MemoryCardListPanel_Simple() throw(){g_uglyPanel=NULL;} +Panels::MemoryCardListPanel_Simple::~MemoryCardListPanel_Simple() {g_uglyPanel=NULL;} Panels::MemoryCardListPanel_Simple::MemoryCardListPanel_Simple( wxWindow* parent ) : _parent( parent ) diff --git a/pcsx2/gui/Panels/MemoryCardPanels.h b/pcsx2/gui/Panels/MemoryCardPanels.h index c901bddcdd..b0954b327e 100644 --- a/pcsx2/gui/Panels/MemoryCardPanels.h +++ b/pcsx2/gui/Panels/MemoryCardPanels.h @@ -222,7 +222,7 @@ namespace Panels public: - virtual ~MemoryCardListPanel_Simple() throw(); + virtual ~MemoryCardListPanel_Simple(); MemoryCardListPanel_Simple( wxWindow* parent ); void UpdateUI(); diff --git a/pcsx2/gui/Panels/PluginSelectorPanel.cpp b/pcsx2/gui/Panels/PluginSelectorPanel.cpp index 66ed654ff6..176726aa15 100644 --- a/pcsx2/gui/Panels/PluginSelectorPanel.cpp +++ b/pcsx2/gui/Panels/PluginSelectorPanel.cpp @@ -437,7 +437,7 @@ Panels::PluginSelectorPanel::PluginSelectorPanel( wxWindow* parent ) Bind(wxEVT_BUTTON, &PluginSelectorPanel::OnConfigure_Clicked, this, ButtonId_Configure); } -Panels::PluginSelectorPanel::~PluginSelectorPanel() throw() +Panels::PluginSelectorPanel::~PluginSelectorPanel() { CancelRefresh(); // in case the enumeration thread is currently refreshing... } diff --git a/pcsx2/gui/RecentIsoList.cpp b/pcsx2/gui/RecentIsoList.cpp index 910586155b..aede377a90 100644 --- a/pcsx2/gui/RecentIsoList.cpp +++ b/pcsx2/gui/RecentIsoList.cpp @@ -42,7 +42,7 @@ RecentIsoManager::RecentIsoManager( wxMenu* menu, int firstIdForMenuItems_or_wxI Bind(wxEVT_MENU, &RecentIsoManager::OnChangedSelection, this); } -RecentIsoManager::~RecentIsoManager() throw() +RecentIsoManager::~RecentIsoManager() { Unbind(wxEVT_MENU, &RecentIsoManager::OnChangedSelection, this); } diff --git a/pcsx2/gui/RecentIsoList.h b/pcsx2/gui/RecentIsoList.h index fd61759cb5..875ffb7223 100644 --- a/pcsx2/gui/RecentIsoList.h +++ b/pcsx2/gui/RecentIsoList.h @@ -50,7 +50,7 @@ protected: public: RecentIsoManager( wxMenu* menu , int firstIdForMenuItems_or_wxID_ANY ); - virtual ~RecentIsoManager() throw(); + virtual ~RecentIsoManager(); void RemoveAllFromMenu(); void Repopulate(); diff --git a/pcsx2/vtlb.h b/pcsx2/vtlb.h index 591bf86b12..7ffde6332a 100644 --- a/pcsx2/vtlb.h +++ b/pcsx2/vtlb.h @@ -100,7 +100,7 @@ protected: public: VtlbMemoryReserve( const wxString& name, size_t size ); - virtual ~VtlbMemoryReserve() throw() + virtual ~VtlbMemoryReserve() { m_reserve.Release(); } @@ -124,7 +124,7 @@ class eeMemoryReserve : public VtlbMemoryReserve public: eeMemoryReserve(); - virtual ~eeMemoryReserve() throw() + virtual ~eeMemoryReserve() { Release(); } @@ -145,7 +145,7 @@ class iopMemoryReserve : public VtlbMemoryReserve public: iopMemoryReserve(); - virtual ~iopMemoryReserve() throw() + virtual ~iopMemoryReserve() { Release(); } @@ -166,7 +166,7 @@ class vuMemoryReserve : public VtlbMemoryReserve public: vuMemoryReserve(); - virtual ~vuMemoryReserve() throw() + virtual ~vuMemoryReserve() { Release(); } diff --git a/pcsx2/windows/WinConsolePipe.cpp b/pcsx2/windows/WinConsolePipe.cpp index 6d1667145d..372e9c04a0 100644 --- a/pcsx2/windows/WinConsolePipe.cpp +++ b/pcsx2/windows/WinConsolePipe.cpp @@ -45,7 +45,7 @@ public: m_name = (m_color == Color_Red) ? L"Redirect_Stderr" : L"Redirect_Stdout"; } - virtual ~WinPipeThread() throw() + virtual ~WinPipeThread() { _parent::Cancel(); } @@ -138,7 +138,7 @@ protected: public: WinPipeRedirection( FILE* stdstream ); - virtual ~WinPipeRedirection() throw(); + virtual ~WinPipeRedirection(); void Cleanup() throw(); }; diff --git a/pcsx2/x86/newVif_HashBucket.h b/pcsx2/x86/newVif_HashBucket.h index 7dc2ecd1d7..990700a9ad 100644 --- a/pcsx2/x86/newVif_HashBucket.h +++ b/pcsx2/x86/newVif_HashBucket.h @@ -63,7 +63,7 @@ public: m_bucket.fill(nullptr); } - ~HashBucket() throw() { clear(); } + ~HashBucket() { clear(); } __fi nVifBlock* find(const nVifBlock& dataPtr) { nVifBlock* chainpos = m_bucket[dataPtr.hash_key];