From e9f9d70611d0a66751c34b1430ed7649aff6e2bf Mon Sep 17 00:00:00 2001 From: Rasmus Munk Larsen Date: Thu, 23 Aug 2018 12:59:46 -0700 Subject: Don't rely on __had_feature for g++. Don't use __thread. Only use thread_local for gcc 4.8 or newer. --- unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'unsupported/Eigen/CXX11/src/ThreadPool') diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h b/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h index f33759ba9..89ed6e5e5 100644 --- a/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h +++ b/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h @@ -12,10 +12,10 @@ #undef EIGEN_THREAD_LOCAL -#if EIGEN_MAX_CPP_VER>=11 && (__has_feature(cxx_thread_local)) - #define EIGEN_THREAD_LOCAL static thread_local -#elif (EIGEN_COMP_GNUC && EIGEN_GNUC_AT_MOST(4, 7)) || EIGEN_COMP_CLANG - #define EIGEN_THREAD_LOCAL static __thread +#if EIGEN_MAX_CPP_VER >= 11 && \ + ((EIGEN_COMP_GNUC && EIGEN_GNUC_AT_LEAST(4, 8)) || \ + __has_feature(cxx_thread_local)) +#define EIGEN_THREAD_LOCAL static thread_local #endif // Disable TLS for Apple and Android builds with older toolchains. -- cgit v1.2.3