diff options
Diffstat (limited to 'async/src/async.h')
-rw-r--r-- | async/src/async.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/async/src/async.h b/async/src/async.h index a72d058..62fb463 100644 --- a/async/src/async.h +++ b/async/src/async.h | |||
@@ -193,7 +193,7 @@ public: | |||
193 | void run(const ExecutionPtr &execution); | 193 | void run(const ExecutionPtr &execution); |
194 | private: | 194 | private: |
195 | EachTask<Out, In> mFunc; | 195 | EachTask<Out, In> mFunc; |
196 | QVector<Async::FutureWatcher<PrevOut>*> mFutureWatchers; | 196 | QVector<Async::FutureWatcher<Out>*> mFutureWatchers; |
197 | }; | 197 | }; |
198 | 198 | ||
199 | template<typename Out, typename In> | 199 | template<typename Out, typename In> |
@@ -729,7 +729,7 @@ void EachExecutor<PrevOut, Out, In>::run(const ExecutionPtr &execution) | |||
729 | const int index = mFutureWatchers.indexOf(fw); | 729 | const int index = mFutureWatchers.indexOf(fw); |
730 | assert(index > -1); | 730 | assert(index > -1); |
731 | mFutureWatchers.removeAt(index); | 731 | mFutureWatchers.removeAt(index); |
732 | out->setValue(out->value() + future.value()); | 732 | Async::detail::aggregateFutureValue<Out>(fw->future(), *out); |
733 | if (mFutureWatchers.isEmpty()) { | 733 | if (mFutureWatchers.isEmpty()) { |
734 | out->setFinished(); | 734 | out->setFinished(); |
735 | } | 735 | } |