From 209308a4d69db87b7cfac1d6716bdc99e21336e3 Mon Sep 17 00:00:00 2001 From: Techjar Date: Mon, 1 Jun 2020 17:32:57 -0400 Subject: [PATCH] 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. --- Source/Core/DolphinQt/QtUtils/RunOnObject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/QtUtils/RunOnObject.h b/Source/Core/DolphinQt/QtUtils/RunOnObject.h index a768b71cb1..8639687da2 100644 --- a/Source/Core/DolphinQt/QtUtils/RunOnObject.h +++ b/Source/Core/DolphinQt/QtUtils/RunOnObject.h @@ -26,7 +26,7 @@ class QObject; template auto RunOnObject(QObject* object, F&& functor) { - using OptionalResultT = std::optional>; + using OptionalResultT = std::optional>; // 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.