devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Address comments about EIGEN_THREAD_LOCAL.

Browse Source
This commit is contained in:
Rasmus Munk Larsen
2018-08-24 10:24:54 -07:00
parent 8d9bc5cc02
commit 744e2fe0de
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
unsupported/Eigen/CXX11/ThreadPool
View File

@@ -44,6 +44,10 @@
#include <thread> #include <thread>
#include <functional> #include <functional>
#include <memory> #include <memory>
#include "src/util/CXX11Meta.h"
#include "src/util/MaxSizeVector.h"
#include "src/ThreadPool/ThreadLocal.h"
#ifndef EIGEN_THREAD_LOCAL #ifndef EIGEN_THREAD_LOCAL
// There are non-parenthesized calls to "max" in the <unordered_map> header, // There are non-parenthesized calls to "max" in the <unordered_map> header,
// which trigger a check in test/main.h causing compilation to fail. // which trigger a check in test/main.h causing compilation to fail.
@@ -54,11 +58,6 @@
#endif #endif
#include <unordered_map> #include <unordered_map>
#endif #endif
#include "src/util/CXX11Meta.h"
#include "src/util/MaxSizeVector.h"
#include "src/ThreadPool/ThreadLocal.h"
#include "src/ThreadPool/ThreadYield.h" #include "src/ThreadPool/ThreadYield.h"
#include "src/ThreadPool/ThreadCancel.h" #include "src/ThreadPool/ThreadCancel.h"
#include "src/ThreadPool/EventCount.h" #include "src/ThreadPool/EventCount.h"

2
unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h
View File

@@ -10,8 +10,6 @@
#ifndef EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H #ifndef EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H
#define EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H #define EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H
#undef EIGEN_THREAD_LOCAL
#if EIGEN_MAX_CPP_VER >= 11 && \ #if EIGEN_MAX_CPP_VER >= 11 && \
((EIGEN_COMP_GNUC && EIGEN_GNUC_AT_LEAST(4, 8)) || \ ((EIGEN_COMP_GNUC && EIGEN_GNUC_AT_LEAST(4, 8)) || \
__has_feature(cxx_thread_local)) __has_feature(cxx_thread_local))