diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-10-26 13:53:50 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-10-27 12:49:39 +0100 |
| commit | bdc34bfb8e4fc696192d0df511ca6acad6a0a272 (patch) | |
| tree | cecfc542b4a25d14e6b1edf8b40f3771420419c1 /src/concurrent | |
| parent | dc77b86be5010ef639d8222c4cb1866379101b5b (diff) | |
Compile fix on Windows
Task-number: QTBUG-87719
Change-Id: I9dd12b4579b40ec9c91a5751e12d371ed6ff5ac4
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/concurrent')
| -rw-r--r-- | src/concurrent/qtconcurrentstoredfunctioncall.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h b/src/concurrent/qtconcurrentstoredfunctioncall.h index f7e9e03e21..1257d70b82 100644 --- a/src/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/concurrent/qtconcurrentstoredfunctioncall.h @@ -66,7 +66,7 @@ struct NonMemberFunctionResolver<Function, PromiseType, Args...> static_assert(std::is_void_v<std::invoke_result_t<std::decay_t<Function>, QPromise<PromiseType> &, std::decay_t<Args>...>>, "The function must return void type."); - static constexpr decltype (auto) invokePointer() + static constexpr auto invokePointer() { return &std::invoke<std::decay_t<Function>, QPromise<PromiseType> &, std::decay_t<Args>...>; } @@ -88,7 +88,7 @@ struct MemberFunctionResolver<Function, PromiseType, Arg, Args...> static_assert(std::is_void_v<std::invoke_result_t<std::decay_t<Function>, std::decay_t<Arg>, QPromise<PromiseType> &, std::decay_t<Args>...>>, "The function must return void type."); - static constexpr decltype (auto) invokePointer() + static constexpr auto invokePointer() { return &std::invoke<std::decay_t<Function>, std::decay_t<Arg>, QPromise<PromiseType> &, std::decay_t<Args>...>; } |