summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-20 13:43:53 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-05-02 12:57:07 (GMT)
commit0188f5ee18d00ae18e65a03c712d3f701e84fa80 (patch)
tree65c9d35325c6a75dfeb4b32fe5bffeed002a71c6 /src/corelib/concurrent
parente9d198b5928e1adf678796c098113bc307ef53f5 (diff)
downloadQt-0188f5ee18d00ae18e65a03c712d3f701e84fa80.zip
Qt-0188f5ee18d00ae18e65a03c712d3f701e84fa80.tar.gz
Qt-0188f5ee18d00ae18e65a03c712d3f701e84fa80.tar.bz2
compile with windows
MSVC doesn't pick up the right template partial specialisation.
Diffstat (limited to 'src/corelib/concurrent')
-rw-r--r--src/corelib/concurrent/qtconcurrentfunctionwrappers.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
index 5652609..4c4714f 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;
};