mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-29 00:33:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

named_thread: rewrite result_storage

Browse Source 
Use SFINAE as permitted by std::invoke_result_t<>
This commit is contained in:
Nekotekina 2021-02-24 13:45:10 +03:00
parent 7cb32a3680
commit 29e7eda887
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Utilities/Thread.h
View File

@ -42,10 +42,20 @@ class need_wakeup {};
template <class Context> template <class Context>
class named_thread; class named_thread;
template <typename T> template <typename Ctx, typename X = void, typename... Args>
struct result_storage struct result_storage
{ {
static_assert(std::is_default_constructible_v<T> && noexcept(T())); static constexpr bool empty = true;
using type = void;
};
template <typename Ctx, typename... Args>
struct result_storage<Ctx, std::enable_if_t<!std::is_void_v<std::invoke_result_t<Ctx, Args&&...>>>, Args...>
{
using T = std::invoke_result_t<Ctx, Args&&...>;
static_assert(std::is_default_constructible_v<T>);
alignas(T) std::byte data[sizeof(T)]; alignas(T) std::byte data[sizeof(T)];
@ -69,17 +79,6 @@ struct result_storage
} }
}; };
template <>
struct result_storage<void>
{
static constexpr bool empty = true;
using type = void;
};
template <class Context, typename... Args>
using result_storage_t = result_storage<std::invoke_result_t<Context, Args...>>;
template <typename T, typename = void> template <typename T, typename = void>
struct thread_thread_name : std::bool_constant<false> {}; struct thread_thread_name : std::bool_constant<false> {};
@ -306,9 +305,9 @@ private:
// Derived from the callable object Context, possibly a lambda // Derived from the callable object Context, possibly a lambda
template <class Context> template <class Context>
class named_thread final : public Context, result_storage_t<Context>, thread_base class named_thread final : public Context, result_storage<Context>, thread_base
{ {
using result = result_storage_t<Context>; using result = result_storage<Context>;
using thread = thread_base; using thread = thread_base;
static u64 entry_point(thread_base* _base) static u64 entry_point(thread_base* _base)