diff --git a/Utilities/Atomic.h b/Utilities/Atomic.h index 0153beda73..582ffa363a 100644 --- a/Utilities/Atomic.h +++ b/Utilities/Atomic.h @@ -619,7 +619,7 @@ public: { func((_new = old)); - if (LIKELY(atomic_storage::compare_exchange(m_data, old, _new))) [[likely]] + if (LIKELY(atomic_storage::compare_exchange(m_data, old, _new))) { return old; } @@ -636,7 +636,7 @@ public: { func((_new = old)); - if (LIKELY(atomic_storage::compare_exchange(m_data, old, _new))) [[likely]] + if (LIKELY(atomic_storage::compare_exchange(m_data, old, _new))) { return _new; } @@ -655,7 +655,7 @@ public: { func((_new = old), args...); - if (LIKELY(atomic_storage::compare_exchange(m_data, old, _new))) [[likely]] + if (LIKELY(atomic_storage::compare_exchange(m_data, old, _new))) { return; } @@ -664,7 +664,7 @@ public: { RT result = func((_new = old), args...); - if (LIKELY(atomic_storage::compare_exchange(m_data, old, _new))) [[likely]] + if (LIKELY(atomic_storage::compare_exchange(m_data, old, _new))) { return result; } diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index ea9cef127d..b929aaa036 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -1837,7 +1837,7 @@ void thread_ctrl::join() m_jcv.wait(lock); } - if (UNLIKELY(m_exception && !std::uncaught_exception())) + if (UNLIKELY(m_exception && !std::uncaught_exceptions())) { std::rethrow_exception(m_exception); } diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 8dcf84e584..8924434fd9 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -808,7 +808,7 @@ void ppu_thread::fast_call(u32 addr, u32 rtoc) auto at_ret = gsl::finally([&]() { - if (std::uncaught_exception()) + if (std::uncaught_exceptions()) { if (last_function) {