diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2016-05-17 10:26:10 -0700 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2016-05-17 10:26:10 -0700 |
| commit | 0bb61b04ca889cc27be2c352375912da294eb569 (patch) | |
| tree | 2753a3f2554e4be7c845a1814750ca57bab8e672 /unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h | |
| parent | 0dbd68145f6b2d834f00967685853c7c38997313 (diff) | |
| parent | 00228f2506b5d64e12ced70262dc795ec15bad6c (diff) | |
Merge upstream.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h index 5320002a1..333ca91e6 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h @@ -14,7 +14,7 @@ namespace Eigen { // Use the SimpleThreadPool by default. We'll switch to the new non blocking // thread pool later. -#ifdef EIGEN_USE_NONBLOCKING_THREAD_POOL +#ifndef EIGEN_USE_SIMPLE_THREAD_POOL template <typename Env> using ThreadPoolTempl = NonBlockingThreadPoolTempl<Env>; typedef NonBlockingThreadPool ThreadPool; #else |