Don't call EnvThread::OnCancel by default since it doesn't do anything.

2 files changed, 4 insertions, 0 deletions

diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h b/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h
index 0e6a0bf8f..ed1a761b6 100644
--- a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h
+++ b/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h
@@ -114,9 +114,11 @@ class NonBlockingThreadPoolTempl : public Eigen::ThreadPoolInterface {
     done_ = true;
 
     // Let each thread know it's been cancelled.
+#ifdef EIGEN_THREAD_ENV_SUPPORTS_CANCELLATION
     for (size_t i = 0; i < threads_.size(); i++) {
       threads_[i]->OnCancel();
     }
+#endif
 
     // Wake up the threads without work to let them exit on their own.
     ec_.Notify(true);
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/SimpleThreadPool.h b/unsupported/Eigen/CXX11/src/ThreadPool/SimpleThreadPool.h
index fb08deb20..335728665 100644
--- a/unsupported/Eigen/CXX11/src/ThreadPool/SimpleThreadPool.h
+++ b/unsupported/Eigen/CXX11/src/ThreadPool/SimpleThreadPool.h
@@ -70,9 +70,11 @@ class SimpleThreadPoolTempl : public ThreadPoolInterface {
   }
 
   void Cancel() {
+#ifdef EIGEN_THREAD_ENV_SUPPORTS_CANCELLATION
     for (size_t i = 0; i < threads_.size(); i++) {
       threads_[i]->OnCancel();
     }
+#endif
   }
 
   int NumThreads() const final {