diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-20 15:43:53 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:53 +0200 |
| commit | 9c3911741968ffaf249d4e23c2c092b7ec135fdb (patch) | |
| tree | 9f74dcedf4a5a1862dfa7b090cdad495cf334463 /src/corelib/concurrent | |
| parent | 7efa2f6aab6801783e236d66331ae1d88ebf17ff (diff) | |
compile with windows
MSVC doesn't pick up the right template partial specialisation.
(cherry picked from commit 0188f5ee18d00ae18e65a03c712d3f701e84fa80)
Diffstat (limited to 'src/corelib/concurrent')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentfunctionwrappers.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h index 56526091fe..4c4714fe45 100644 --- a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h @@ -216,14 +216,14 @@ struct MapResultType typedef typename MapFunctor::result_type ResultType; }; -template <class InputSequence, class U, class V> -struct MapResultType<InputSequence, U (*)(V)> +template <class U, class V> +struct MapResultType<void, U (*)(V)> { typedef U ResultType; }; -template <class InputSequence, class T, class C> -struct MapResultType<InputSequence, T(C::*)() const> +template <class T, class C> +struct MapResultType<void, T(C::*)() const> { typedef T ResultType; }; |