Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.
authorLiang Qi <liang.qi@nokia.com>
Tue, 26 Apr 2011 12:01:18 +0000 (14:01 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Tue, 10 May 2011 10:54:54 +0000 (12:54 +0200)
Because Qt doesn't support that feature before.
(cherry picked from commit c12ed14fb38ae77be194e19a27545190aded830b)

src/corelib/concurrent/qtconcurrentfunctionwrappers.h

index fa675eb..98506a5 100644 (file)
@@ -260,24 +260,6 @@ struct MapResultType<InputSequence<T>, U(C::*)() const>
     typedef InputSequence<U> ResultType;
 };
 
-template <template <typename, typename> class InputSequence, typename MapFunctor, typename T, typename T2>
-struct MapResultType<InputSequence<T, T2>, MapFunctor>
-{
-    typedef InputSequence<typename LazyResultType<MapFunctor>::Type, T2> ResultType;
-};
-
-template <template <typename, typename> class InputSequence, class T, typename T2, class U, class V>
-struct MapResultType<InputSequence<T, T2>, U (*)(V)>
-{
-    typedef InputSequence<U, T2> ResultType;
-};
-
-template <template <typename, typename> class InputSequence, class T, typename T2, class U, class C>
-struct MapResultType<InputSequence<T, T2>, U(C::*)() const>
-{
-    typedef InputSequence<U, T2> ResultType;
-};
-
 #endif // QT_NO_TEMPLATE_TEMPLATE_PARAMETER
 
 template <class MapFunctor>