Merge branch 'master' of github.com:ExtremeScale/ThreadPool into lockfree_merge

Chris Sullivan · Chris Sullivan · commit 5d18a818d81b · 2016-05-02T13:07:01.000-04:00
diff --git a/include/ThreadPool.hh b/include/ThreadPool.hh
@@ -42,7 +42,6 @@ public:
                                         m_promises[mypromise].set_value();
                                 });
                 }
-                //m_taskQueue.pop()(); // master thread is also a worker
                 Finish();
         }
         template<typename InputIt, typename T>
@@ -59,10 +58,9 @@ public:
                     while (threadBegin != threadEnd) {
                         *(threadOutput++) = func(*(threadBegin++));
                     }
-                    m_promises[mypromise].set_value(); // master thread is also a worker
+                    m_promises[mypromise].set_value();
                 });
             }
-            //m_taskQueue.pop()();
             Finish();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ public:`
`42`	`42`	`m_promises[mypromise].set_value();`
`43`	`43`	`});`
`44`	`44`	`}`
`45`		`- //m_taskQueue.pop()(); // master thread is also a worker`
`46`	`45`	`Finish();`
`47`	`46`	`}`
`48`	`47`	`template<typename InputIt, typename T>`
`@@ -59,10 +58,9 @@ public:`
`59`	`58`	`while (threadBegin != threadEnd) {`
`60`	`59`	`(threadOutput++) = func((threadBegin++));`
`61`	`60`	`}`
`62`		`- m_promises[mypromise].set_value(); // master thread is also a worker`
	`61`	`+ m_promises[mypromise].set_value();`
`63`	`62`	`});`
`64`	`63`	`}`
`65`		`- //m_taskQueue.pop()();`
`66`	`64`	`Finish();`
`67`	`65`	`}`
`68`	`66`