diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-10-25 14:40:32 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-11-03 16:28:14 +0100 |
| commit | ba1266baec820ab82b4dccb45f7c248052e8962e (patch) | |
| tree | 9949eb976171c456bfb4d5b08ab2171ab0f5f69d /src/concurrent | |
| parent | 5646f46ec98b3459ff4da7101eee27f4539d4229 (diff) | |
| download | qtbase-ba1266baec820ab82b4dccb45f7c248052e8962e.tar.gz | |
Use variadic templates to generalize MapSequenceResultType
This helps us determine the correct result type for std::vector, as
that one has two template arguments and would otherwise not get
caught here.
Change-Id: Ie887088bce25df2cadc8422a4212dc33d57ecfa5
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/concurrent')
| -rw-r--r-- | src/concurrent/qtconcurrentfunctionwrappers.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index c8aab34b87..194d020fb2 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -156,10 +156,10 @@ struct MapSequenceResultType<QStringList, MapFunctor> #ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS -template <template <typename> class InputSequence, typename MapFunctor, typename T> -struct MapSequenceResultType<InputSequence<T>, MapFunctor> +template <template <typename...> class InputSequence, typename MapFunctor, typename ...T> +struct MapSequenceResultType<InputSequence<T...>, MapFunctor> { - typedef InputSequence<QtPrivate::MapResultType<InputSequence<T>, MapFunctor>> ResultType; + typedef InputSequence<QtPrivate::MapResultType<InputSequence<T...>, MapFunctor>> ResultType; }; #endif // QT_NO_TEMPLATE_TEMPLATE_PARAMETER |