diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-04-26 14:01:18 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:54 +0200 |
| commit | 046befd0c4118d20010f70133139d1e227f47573 (patch) | |
| tree | bc47f9dd5f0b6db5525acefdb21f675558c3c3b1 /src | |
| parent | 91f5144f9042d100e1dd91b4fcf1b12969e3b8d3 (diff) | |
Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.
Because Qt doesn't support that feature before.
(cherry picked from commit c12ed14fb38ae77be194e19a27545190aded830b)
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentfunctionwrappers.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h index fa675eb336..98506a597a 100644 --- a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h @@ -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> |