Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Utilities/Atomic.h
+4 -4
View File
@@ -619,7 +619,7 @@ public:
{
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;
}
@@ -636,7 +636,7 @@ public:
{
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;
}
@@ -655,7 +655,7 @@ public:
{
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;
}
@@ -664,7 +664,7 @@ public:
{
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;
}
Utilities/Thread.cpp
+1 -1
View File
@@ -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);
}