diff options
| -rw-r--r-- | src/concurrent/qtconcurrentfilterkernel.h | 6 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentmapkernel.h | 4 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentreducekernel.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/concurrent/qtconcurrentfilterkernel.h b/src/concurrent/qtconcurrentfilterkernel.h index 90d5b9aa770..5f9094f6b68 100644 --- a/src/concurrent/qtconcurrentfilterkernel.h +++ b/src/concurrent/qtconcurrentfilterkernel.h @@ -93,7 +93,7 @@ public: sequence(_sequence), keep(_keep), reduce(_reduce), - reducer(OrderedReduce) + reducer(pool, OrderedReduce) { } bool runIteration(typename Sequence::const_iterator it, int index, T *) override @@ -173,7 +173,7 @@ public: ReduceFunctor _reduce, ReduceOptions reduceOption) : IterateKernelType(pool, begin, end), reducedResult(), keep(_keep), reduce(_reduce), - reducer(reduceOption) + reducer(pool, reduceOption) { } FilteredReducedKernel(QThreadPool *pool, Iterator begin, Iterator end, KeepFunctor _keep, @@ -183,7 +183,7 @@ public: reducedResult(std::forward<ReducedResultType>(initialValue)), keep(_keep), reduce(_reduce), - reducer(reduceOption) + reducer(pool, reduceOption) { } diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index e882dbfa754..11be2626288 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/concurrent/qtconcurrentmapkernel.h @@ -103,7 +103,7 @@ public: MappedReducedKernel(QThreadPool *pool, Iterator begin, Iterator end, MapFunctor _map, ReduceFunctor _reduce, ReduceOptions reduceOptions) : IterateKernel<Iterator, ReducedResultType>(pool, begin, end), reducedResult(), - map(_map), reduce(_reduce), reducer(reduceOptions) + map(_map), reduce(_reduce), reducer(pool, reduceOptions) { } MappedReducedKernel(QThreadPool *pool, Iterator begin, Iterator end, MapFunctor _map, @@ -113,7 +113,7 @@ public: reducedResult(std::forward<ReducedResultType>(initialValue)), map(_map), reduce(_reduce), - reducer(reduceOptions) + reducer(pool, reduceOptions) { } diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h index 4c023ebb4af..9a9027c9d04 100644 --- a/src/concurrent/qtconcurrentreducekernel.h +++ b/src/concurrent/qtconcurrentreducekernel.h @@ -140,9 +140,9 @@ class ReduceKernel } public: - ReduceKernel(ReduceOptions _reduceOptions) + ReduceKernel(QThreadPool *pool, ReduceOptions _reduceOptions) : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0), - threadCount(QThreadPool::globalInstance()->maxThreadCount()) + threadCount(pool->maxThreadCount()) { } void runReduce(ReduceFunctor &reduce, |