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

Rename thread_abort (name conflict)

Browse source
This commit is contained in:
Nekotekina 2018-10-02 17:49:53 +03:00
parent c9adb52f63
commit 4bef0f8dab
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Utilities/Thread.h
View file

@ -84,10 +84,17 @@ using result_storage_t = result_storage<std::invoke_result_t<Context, Args...>>;
// Detect on_abort() method (should return void) // Detect on_abort() method (should return void)
template <typename T, typename = void> template <typename T, typename = void>
struct thread_abort : std::bool_constant<false> {}; struct thread_on_abort : std::bool_constant<false> {};
template <typename T> template <typename T>
struct thread_abort<T, decltype(std::declval<named_thread<T>&>().on_abort())> : std::bool_constant<true> {}; struct thread_on_abort<T, decltype(std::declval<named_thread<T>&>().on_abort())> : std::bool_constant<true> {};
// Detect on_cleanup() static function (should return void)
template <typename T, typename = void>
struct thread_on_cleanup : std::bool_constant<false> {};
template <typename T>
struct thread_on_cleanup<T, decltype(named_thread<T>::on_cleanup(std::declval<named_thread<T>*>()))> : std::bool_constant<true> {};
// Simple list of void() functors // Simple list of void() functors
class task_stack class task_stack
@ -498,7 +505,7 @@ public:
if (thread::m_state.compare_and_swap_test(thread_state::created, thread_state::aborting)) if (thread::m_state.compare_and_swap_test(thread_state::created, thread_state::aborting))
{ {
// Call on_abort() method if it's available // Call on_abort() method if it's available
if constexpr (thread_abort<Context>()) if constexpr (thread_on_abort<Context>())
{ {
Context::on_abort(); Context::on_abort();
} }