fixed compile error in vsc

tsung-wei-huang · tsung-wei-huang · commit 1a4ffa2a99e5 · 2018-09-18T19:10:24.000-05:00
diff --git a/example/threadpool.cpp b/example/threadpool.cpp
@@ -143,7 +143,7 @@ auto binary_tree() {
   std::atomic<size_t> sum {0};
   std::function<void(int)> insert;
   
-  insert = [&threadpool, &insert, &sum] (int l) {
+  insert = [&] (int l) {
     sum.fetch_add(1, std::memory_order_relaxed);
     if(l < num_levels) {
       for(int i=0; i<2; ++i) {
@@ -279,7 +279,7 @@ auto linear_insertions() {
     }
   };
 
-  for(size_t i=0; i<num_threads; i++){
+  for(int i=0; i<num_threads; i++){
     insert(num_tasks / num_threads);
   }
 
diff --git a/unittest/threadpool.cpp b/unittest/threadpool.cpp
@@ -507,7 +507,7 @@ TEST_CASE("WorkerQueue.OneThread" * doctest::timeout(300)) {
 // ----------------------------------------------------------------------------
 TEST_CASE("WorkerQueue.TwoThread" * doctest::timeout(300)) {
 
-  constexpr size_t N = (1 << 20);
+  const static size_t N = (1 << 20);
 
   privatized_threadpool::RunQueue<int, 64> queue; 
 
@@ -517,15 +517,15 @@ TEST_CASE("WorkerQueue.TwoThread" * doctest::timeout(300)) {
 
     REQUIRE(queue.empty());
 
-    std::thread t1([&queue, i=0] () mutable {
+    std::thread t1([&, i=0] () mutable {
       while(i < N) {
         if(queue.push_front(i)) {
           ++i;
         }
       }
     });
 
-    std::thread t2([&queue, i=0] () mutable {
+    std::thread t2([&, i=0] () mutable {
       int data;
       while(i < N) {
         if(queue.pop_back(data)) {
@@ -546,15 +546,15 @@ TEST_CASE("WorkerQueue.TwoThread" * doctest::timeout(300)) {
 
     REQUIRE(queue.empty());
 
-    std::thread t1([&queue, i=0] () mutable {
+    std::thread t1([&, i=0] () mutable {
       while(i < N) {
         if(queue.push_back(i)) {
           ++i;
         }
       }
     });
 
-    std::thread t2([&queue, i=0] () mutable {
+    std::thread t2([&, i=0] () mutable {
       int data;
       while(i < N) {
         if(queue.pop_front(data)) {
@@ -577,15 +577,15 @@ TEST_CASE("WorkerQueue.TwoThread" * doctest::timeout(300)) {
 
     REQUIRE(queue.empty());
 
-    std::thread t1([&queue, i=0] () mutable {
+    std::thread t1([&, i=0] () mutable {
       while(i < N) {
         if(queue.push_back(i)) {
           ++i;
         }
       }
     });
 
-    std::thread t2([&queue, i=0, &res] () mutable {
+    std::thread t2([&, i=0] () mutable {
       int data;
       while(i < N) {
         if(queue.pop_back(data)) {
@@ -624,23 +624,23 @@ TEST_CASE("WorkerQueue.TriThread" * doctest::timeout(300)) {
   // push front + push back + pop back
   REQUIRE(queue.empty());
 
-  std::thread t1([&queue, i=0] () mutable {
+  std::thread t1([&, i=0] () mutable {
     while(i < N/2) {
       if(queue.push_front(i)) {
         ++i;
       }
     }
   });
   
-  std::thread t2([&queue, i=N/2] () mutable {
+  std::thread t2([&, i=N/2] () mutable {
     while(i < N) {
       if(queue.push_back(i)) {
         ++i;
       }
     }
   });
 
-  std::thread t3([&queue, i=0, &res] () mutable {
+  std::thread t3([&, i=0] () mutable {
     int data;
     while(i < N) {
       if(queue.pop_back(data)) {

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ auto binary_tree() {`
`143`	`143`	`std::atomic<size_t> sum {0};`
`144`	`144`	`std::function<void(int)> insert;`
`145`	`145`
`146`		`- insert = [&threadpool, &insert, &sum] (int l) {`
	`146`	`+ insert = [&] (int l) {`
`147`	`147`	`sum.fetch_add(1, std::memory_order_relaxed);`
`148`	`148`	`if(l < num_levels) {`
`149`	`149`	`for(int i=0; i<2; ++i) {`
`@@ -279,7 +279,7 @@ auto linear_insertions() {`
`279`	`279`	`}`
`280`	`280`	`};`
`281`	`281`
`282`		`- for(size_t i=0; i<num_threads; i++){`
	`282`	`+ for(int i=0; i<num_threads; i++){`
`283`	`283`	`insert(num_tasks / num_threads);`
`284`	`284`	`}`
`285`	`285`