Compile fix for visual studio.

vblanco20-1 · vblanco20-1 · commit bd89c16ac672 · 2018-06-16T18:25:40.000+02:00
diff --git a/example/matrix.cpp b/example/matrix.cpp
@@ -118,21 +118,21 @@ void openmp(const std::vector<size_t>& D) {
   std::cout << "Generating matrix As ...\n";
   std::vector<matrix_t> As(D.size());
   #pragma omp parallel for
-  for(size_t j=0; j<D.size(); ++j) {
+  for(int j=0; j<D.size(); ++j) {
     As[j] = random_matrix(D[j]);
   }
   
   std::cout << "Generating matrix Bs ...\n";
   std::vector<matrix_t> Bs(D.size());
   #pragma omp parallel for
-  for(size_t j=0; j<D.size(); ++j) {
+  for(int j=0; j<D.size(); ++j) {
     Bs[j] = random_matrix(D[j]);
   }
   
   std::cout << "Computing matrix product values Cs ...\n";
   std::vector<matrix_t> Cs(D.size());
   #pragma omp parallel for
-  for(size_t j=0; j<D.size(); ++j) {
+  for(int j=0; j<D.size(); ++j) {
     Cs[j] = As[j] * Bs[j];
   }
 
diff --git a/taskflow.hpp b/taskflow.hpp
@@ -250,6 +250,18 @@ auto Threadpool::silent_async(C&& c, Signal sig) {
   }
 }
 
+template<typename T, typename C>
+void set_promise_value(std::promise<T>& p, C &c)
+{
+	p.set_value(c());
+}
+template< typename C>
+void set_promise_value(std::promise<void>& p, C &c)
+{
+	p.set_value();
+}
+
+
 // Function: async
 // Insert a callable task and return a future representing the task.
 template<typename C>
@@ -276,13 +288,17 @@ auto Threadpool::async(C&& c, Signal sig) {
       std::unique_lock lock(_mutex);
       _task_queue.emplace_back(
         [p=MoveOnCopy(std::move(p)), c=std::forward<C>(c), ret=sig] () mutable { 
+          
+          //VS compile fix
+          set_promise_value(p.get(), c);
+          /*
           if constexpr(std::is_same_v<void, R>) {
             c();
             p.get().set_value();
           }
           else {
             p.get().set_value(c());
-          }
+          }*/
           return ret;
         }
       );
