diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2018-08-24 10:24:54 -0700 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2018-08-24 10:24:54 -0700 |
| commit | 744e2fe0dedb697a8802a3e633e37a4f844da372 (patch) | |
| tree | 2b1b56570efc5627d8f06f318d36ae9aae3fb828 /unsupported | |
| parent | 8d9bc5cc022bee4a06201c7c5a1dec2b73697f5f (diff) | |
Address comments about EIGEN_THREAD_LOCAL.
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/CXX11/ThreadPool | 9 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/unsupported/Eigen/CXX11/ThreadPool b/unsupported/Eigen/CXX11/ThreadPool index 64ea83b7e..1dcc4eb6c 100644 --- a/unsupported/Eigen/CXX11/ThreadPool +++ b/unsupported/Eigen/CXX11/ThreadPool @@ -44,6 +44,10 @@ #include <thread> #include <functional> #include <memory> +#include "src/util/CXX11Meta.h" +#include "src/util/MaxSizeVector.h" + +#include "src/ThreadPool/ThreadLocal.h" #ifndef EIGEN_THREAD_LOCAL // There are non-parenthesized calls to "max" in the <unordered_map> header, // which trigger a check in test/main.h causing compilation to fail. @@ -54,11 +58,6 @@ #endif #include <unordered_map> #endif - -#include "src/util/CXX11Meta.h" -#include "src/util/MaxSizeVector.h" - -#include "src/ThreadPool/ThreadLocal.h" #include "src/ThreadPool/ThreadYield.h" #include "src/ThreadPool/ThreadCancel.h" #include "src/ThreadPool/EventCount.h" diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h b/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h index 89ed6e5e5..a41731c34 100644 --- a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h +++ b/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h @@ -10,8 +10,6 @@ #ifndef EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H #define EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H -#undef EIGEN_THREAD_LOCAL - #if EIGEN_MAX_CPP_VER >= 11 && \ ((EIGEN_COMP_GNUC && EIGEN_GNUC_AT_LEAST(4, 8)) || \ __has_feature(cxx_thread_local)) |