diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-10-02 19:24:38 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-10-28 15:38:44 +0100 |
| commit | cf043a785ac9357e8f1283ea9e1496261af2b1a5 (patch) | |
| tree | e85e282dbfb839ab4185c7b44caefe7248509696 /src/corelib/thread | |
| parent | bb8c24e467767e35cb104167689b96c0deea5639 (diff) | |
QtConcurrent: Integrate runWithPromise into run
Change-Id: I6eb95aa66ff847e8bb9aac348fded3a5d55015b6
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qfuture_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/thread/qfuture_impl.h b/src/corelib/thread/qfuture_impl.h index bd3976f990..b8b9f39951 100644 --- a/src/corelib/thread/qfuture_impl.h +++ b/src/corelib/thread/qfuture_impl.h @@ -124,7 +124,7 @@ struct ArgsType<Arg, Args...> { using First = Arg; using PromiseType = void; - static const bool IsPromise = false; + using IsPromise = std::false_type; static const bool HasExtraArgs = (sizeof...(Args) > 0); using AllArgs = std::conditional_t<HasExtraArgs, std::tuple<std::decay_t<Arg>, std::decay_t<Args>...>, @@ -139,7 +139,7 @@ struct ArgsType<QPromise<Arg> &, Args...> { using First = QPromise<Arg> &; using PromiseType = Arg; - static const bool IsPromise = true; + using IsPromise = std::true_type; static const bool HasExtraArgs = (sizeof...(Args) > 0); using AllArgs = std::conditional_t<HasExtraArgs, std::tuple<std::decay_t<QPromise<Arg> &>, std::decay_t<Args>...>, @@ -154,7 +154,7 @@ struct ArgsType<> { using First = void; using PromiseType = void; - static const bool IsPromise = false; + using IsPromise = std::false_type; static const bool HasExtraArgs = false; using AllArgs = void; |