From ba1266baec820ab82b4dccb45f7c248052e8962e Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Sun, 25 Oct 2020 14:40:32 +0100
Subject: Use variadic templates to generalize MapSequenceResultType
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/concurrent/qtconcurrentfunctionwrappers.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3