1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use variadic templates to generalize MapSequenceResultType

Browse Source 
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>
This commit is contained in:
Lars Knoll 2020-10-25 14:40:32 +01:00
parent 5646f46ec9
commit ba1266baec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/concurrent/qtconcurrentfunctionwrappers.h
View File

@ -156,10 +156,10 @@ struct MapSequenceResultType<QStringList, MapFunctor>
#ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS #ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
template <template <typename> class InputSequence, typename MapFunctor, typename T> template <template <typename...> class InputSequence, typename MapFunctor, typename ...T>
struct MapSequenceResultType<InputSequence<T>, MapFunctor> 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 #endif // QT_NO_TEMPLATE_TEMPLATE_PARAMETER