archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use std::uncaught_exceptions()

Browse source 
Also remove wrong attributes
This commit is contained in:
Nekotekina 2018-09-04 20:59:38 +03:00
parent ea4a3b2476
commit d750e955c3
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Utilities/Atomic.h
View file

@ -619,7 +619,7 @@ public:
{ {
func((_new = old)); func((_new = old));
if (LIKELY(atomic_storage<type>::compare_exchange(m_data, old, _new))) [[likely]] if (LIKELY(atomic_storage<type>::compare_exchange(m_data, old, _new)))
{ {
return old; return old;
} }
@ -636,7 +636,7 @@ public:
{ {
func((_new = old)); func((_new = old));
if (LIKELY(atomic_storage<type>::compare_exchange(m_data, old, _new))) [[likely]] if (LIKELY(atomic_storage<type>::compare_exchange(m_data, old, _new)))
{ {
return _new; return _new;
} }
@ -655,7 +655,7 @@ public:
{ {
func((_new = old), args...); func((_new = old), args...);
if (LIKELY(atomic_storage<type>::compare_exchange(m_data, old, _new))) [[likely]] if (LIKELY(atomic_storage<type>::compare_exchange(m_data, old, _new)))
{ {
return; return;
} }
@ -664,7 +664,7 @@ public:
{ {
RT result = func((_new = old), args...); RT result = func((_new = old), args...);
if (LIKELY(atomic_storage<type>::compare_exchange(m_data, old, _new))) [[likely]] if (LIKELY(atomic_storage<type>::compare_exchange(m_data, old, _new)))
{ {
return result; return result;
} }

2
Utilities/Thread.cpp
View file

@ -1837,7 +1837,7 @@ void thread_ctrl::join()
m_jcv.wait(lock); m_jcv.wait(lock);
} }
if (UNLIKELY(m_exception && !std::uncaught_exception())) if (UNLIKELY(m_exception && !std::uncaught_exceptions()))
{ {
std::rethrow_exception(m_exception); std::rethrow_exception(m_exception);
} }

2
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -808,7 +808,7 @@ void ppu_thread::fast_call(u32 addr, u32 rtoc)
auto at_ret = gsl::finally([&]() auto at_ret = gsl::finally([&]()
{ {
if (std::uncaught_exception()) if (std::uncaught_exceptions())
{ {
if (last_function) if (last_function)
{ {