Fix the VS compilation error in FlowBuilder:emplace. Fix the float to int conversion in reduce.cpp

Chun-Xun Lin · Chun-Xun Lin · commit 5e736fe9c8dc · 2018-08-27T15:19:47.000-05:00
diff --git a/example/reduce.cpp b/example/reduce.cpp
@@ -75,7 +75,7 @@ void transform_reduce() {
   tf::Taskflow tf;
   auto tmin = std::numeric_limits<int>::max();
   tf.transform_reduce(data.begin(), data.end(), tmin, 
-    [] (float l, float r) { return std::min(l, r); },
+    [] (int l, int r) { return std::min(l, r); },
     [] (const Data& d) { return d.transform(); }
   );
   tf.wait_for_all();
diff --git a/taskflow/taskflow.hpp b/taskflow/taskflow.hpp
@@ -978,18 +978,19 @@ auto BasicFlowBuilder<NodeType>::emplace(C&& c) {
     std::promise<R> p;
     auto fu = p.get_future();
 
-    auto& node = _nodes.emplace_front(
-      [p=MoC(std::move(p)), c=std::forward<C>(c)] () mutable { 
-        if constexpr(std::is_same_v<void, R>) {
-          c();
-          p.get().set_value();
-        }
-        else {
-          p.get().set_value(c());
-        }
-      }
-    );
-    return std::make_pair(TaskType(node), std::move(fu));
+    if constexpr(std::is_same_v<void, R>) {
+      auto& node = _nodes.emplace_front([p = MoC(std::move(p)), c = std::forward<C>(c)]() mutable {
+        c(); 
+        p.get().set_value();
+			});
+      return std::make_pair(TaskType(node), std::move(fu));
+    }
+    else {
+      auto& node = _nodes.emplace_front([p = MoC(std::move(p)), c = std::forward<C>(c)]() mutable {
+        p.get().set_value(c());
+      });
+      return std::make_pair(TaskType(node), std::move(fu));
+    }
   }
   else {
     static_assert(dependent_false_v<C>, "invalid task work type");
