oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

win32/ComWorker: remove parameter passing from Async()

Browse Source 
Parameters should better be captured.  This removes some complexity
from Async().
This commit is contained in:
Max Kellermann
2021-03-07 18:17:16 +01:00
parent 90d97053a8
commit cf108c389f
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/win32/ComWorker.hxx
View File

@@ -65,24 +65,19 @@ public:
COMWorker(const COMWorker &) = delete; COMWorker(const COMWorker &) = delete;
COMWorker &operator=(const COMWorker &) = delete; COMWorker &operator=(const COMWorker &) = delete;
template <typename Function, typename... Args> template<typename Function>
auto Async(Function &&function, Args &&...args) { auto Async(Function &&function) {
using R = std::invoke_result_t<std::decay_t<Function>, using R = std::invoke_result_t<std::decay_t<Function>>;
std::decay_t<Args>...>;
auto promise = std::make_shared<Promise<R>>(); auto promise = std::make_shared<Promise<R>>();
auto future = promise->get_future(); auto future = promise->get_future();
thread.Push([function = std::forward<Function>(function), thread.Push([function = std::forward<Function>(function),
args = std::make_tuple(std::forward<Args>(args)...),
promise = std::move(promise)]() mutable { promise = std::move(promise)]() mutable {
try { try {
if constexpr (std::is_void_v<R>) { if constexpr (std::is_void_v<R>) {
std::apply(std::forward<Function>(function), std::invoke(std::forward<Function>(function));
std::move(args));
promise->set_value(); promise->set_value();
} else { } else {
promise->set_value(std::apply( promise->set_value(std::invoke(std::forward<Function>(function)));
std::forward<Function>(function),
std::move(args)));
} }
} catch (...) { } catch (...) {
promise->set_exception(std::current_exception()); promise->set_exception(std::current_exception());