whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get rid of the DisableIfSame hack 

By changing the order of the parametters, in a way it is unlikely to clash
(cherry picked from commit e9d198b5928e1adf678796c098113bc307ef53f5)
bb10
Olivier Goffart 2011-04-19 15:58:09 +02:00
parent 5d85018720
commit 7efa2f6aab
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/concurrent/qtconcurrentfunctionwrappers.h
View File

@ -286,18 +286,6 @@ struct MapResultType<QStringList, U(C::*)() const>
typedef QList<U> ResultType;
};
template <typename ReturnType, typename T>
struct DisableIfSame
{
typedef ReturnType Type;
};
template <typename T>
struct DisableIfSame<T, T>
{
};
} // namespace QtPrivate.
#endif //qdoc

8
src/corelib/concurrent/qtconcurrentmap.h
View File

@ -206,7 +206,7 @@ void blockingMap(Iterator begin, Iterator end, MapFunctor map)
// blockingMappedReduced() for sequences
template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor>
typename QtPrivate::DisableIfSame<ResultType, Sequence>::Type blockingMappedReduced(const Sequence &sequence,
ResultType blockingMappedReduced(const Sequence &sequence,
MapFunctor map,
ReduceFunctor reduce,
ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))
@ -219,7 +219,7 @@ typename QtPrivate::DisableIfSame<ResultType, Sequence>::Type blockingMappedRedu
.startBlocking();
}
template <typename Sequence, typename MapFunctor, typename ReduceFunctor>
template <typename MapFunctor, typename ReduceFunctor, typename Sequence>
typename QtPrivate::ReduceResultType<ReduceFunctor>::ResultType blockingMappedReduced(const Sequence &sequence,
MapFunctor map,
ReduceFunctor reduce,
@ -266,7 +266,7 @@ typename QtPrivate::ReduceResultType<ReduceFunctor>::ResultType blockingMappedRe
// mapped() for sequences with a different putput sequence type.
template <typename OutputSequence, typename InputSequence, typename MapFunctor>
typename QtPrivate::DisableIfSame<OutputSequence, InputSequence>::Type blockingMapped(const InputSequence &sequence, MapFunctor map)
OutputSequence blockingMapped(const InputSequence &sequence, MapFunctor map)
{
return blockingMappedReduced<OutputSequence>
(sequence,
@ -275,7 +275,7 @@ typename QtPrivate::DisableIfSame<OutputSequence, InputSequence>::Type blockingM
QtConcurrent::OrderedReduce);
}
template <typename InputSequence, typename MapFunctor>
template <typename MapFunctor, typename InputSequence>
typename QtPrivate::MapResultType<InputSequence, MapFunctor>::ResultType blockingMapped(const InputSequence &sequence, MapFunctor map)
{
typedef typename QtPrivate::MapResultType<InputSequence, MapFunctor>::ResultType OutputSequence;