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

Replace usage of std::result_of with std::invoke_result 

std::result_of is deprecated in C++17, and removed in C++20. Microsoft
has gone ahead with the removal as of Visual Studio 16.6.0, so before
this change our code is broken there.
This commit is contained in:
Techjar 2020-06-01 17:32:57 -04:00
parent 4fc8674a7a
commit 209308a4d6
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.