3 files changed, 44 insertions, 4 deletions

diff --git a/async/autotests/asynctest.cpp b/async/autotests/asynctest.cpp
index d709567..9789950 100644
--- a/async/autotests/asynctest.cpp
+++ b/async/autotests/asynctest.cpp
@@ -55,7 +55,8 @@ private Q_SLOTS:
     void testAsyncEach();
     void testSyncEach();
     void testJoinedEach();
-    void testVoidEach();
+    void testVoidEachThen();
+    void testAsyncVoidEachThen();
 
     void testAsyncReduce();
     void testSyncReduce();
@@ -382,7 +383,7 @@ void AsyncTest::testJoinedEach()
     QCOMPARE(future.value(), expected);
 }
 
-void AsyncTest::testVoidEach()
+void AsyncTest::testVoidEachThen()
 {
     QList<int> check;
     auto job = Async::start<QList<int>>(
@@ -391,12 +392,37 @@ void AsyncTest::testVoidEach()
         }).each<void, int>(
         [&check](const int &v) {
             check << v;
+        }).then<void>([](){});
+
+    auto future = job.exec();
+
+    const QList<int> expected({ 1, 2, 3, 4 });
+    QVERIFY(future.isFinished());
+    QCOMPARE(check, expected);
+}
+
+void AsyncTest::testAsyncVoidEachThen()
+{
+    bool completedJob = false;
+    QList<int> check;
+    auto job = Async::start<QList<int>>(
+        [](Async::Future<QList<int> > &future) {
+            new AsyncSimulator<QList<int>>(future, { 1, 2, 3, 4 });
+        }).each<void, int>(
+        [&check](const int &v, Async::Future<void> &future) {
+            check << v;
+            new AsyncSimulator<void>(future);
+        }).then<void>([&completedJob](Async::Future<void> &future) {
+            completedJob = true;
+            future.setFinished();
         });
 
     auto future = job.exec();
+    future.waitForFinished();
 
     const QList<int> expected({ 1, 2, 3, 4 });
     QVERIFY(future.isFinished());
+    QVERIFY(completedJob);
     QCOMPARE(check, expected);
 }
 
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:
     void run(const ExecutionPtr &execution);
 private:
     EachTask<Out, In> mFunc;
-    QVector<Async::FutureWatcher<PrevOut>*> mFutureWatchers;
+    QVector<Async::FutureWatcher<Out>*> mFutureWatchers;
 };
 
 template<typename Out, typename In>
@@ -729,7 +729,7 @@ void EachExecutor<PrevOut, Out, In>::run(const ExecutionPtr &execution)
                              const int index = mFutureWatchers.indexOf(fw);
                              assert(index > -1);
                              mFutureWatchers.removeAt(index);
-                             out->setValue(out->value() + future.value());
+                             Async::detail::aggregateFutureValue<Out>(fw->future(), *out);
                              if (mFutureWatchers.isEmpty()) {
                                  out->setFinished();
                              }
diff --git a/async/src/async_impl.h b/async/src/async_impl.h
index eccbc9b..8c74193 100644
--- a/async/src/async_impl.h
+++ b/async/src/async_impl.h
@@ -60,6 +60,20 @@ copyFutureValue(const Async::Future<T> &in, Async::Future<T> &out)
     // noop
 }
 
+template<typename T>
+inline typename std::enable_if<!std::is_void<T>::value, void>::type
+aggregateFutureValue(const Async::Future<T> &in, Async::Future<T> &out)
+{
+    out.setValue(out.value() + in.value());
+}
+
+template<typename T>
+inline typename std::enable_if<std::is_void<T>::value, void>::type
+aggregateFutureValue(const Async::Future<T> &in, Async::Future<T> &out)
+{
+    // noop
+}
+
 } // namespace Detail
 
 } // namespace Async