ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8841 from Techjar/remove-result-of 

Replace usage of std::result_of with std::invoke_result
This commit is contained in:
LC 2020-06-01 18:44:45 -04:00 committed by GitHub
parent 4fc8674a7a 209308a4d6
commit 84d67b3547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt/QtUtils/RunOnObject.h
View File

@ -26,7 +26,7 @@ class QObject;
template <typename F> template <typename F>
auto RunOnObject(QObject* object, F&& functor) auto RunOnObject(QObject* object, F&& functor)
{ {
using OptionalResultT = std::optional<std::result_of_t<F()>>; using OptionalResultT = std::optional<std::invoke_result_t<F>>;
// If we queue up a functor on the current thread, it won't run until we return to the event loop, // If we queue up a functor on the current thread, it won't run until we return to the event loop,
// which means waiting for it to finish will never complete. Instead, run it immediately. // which means waiting for it to finish will never complete. Instead, run it immediately.