diff options
author | 2016-05-20 15:05:38 +0200 | |
---|---|---|
committer | 2016-05-20 15:05:38 +0200 | |
commit | c3410804cdaa8d4ce16d8269e86228eb8a2caf3b (patch) | |
tree | 46bd230f018dce918b3d834ac90d498b90db1297 /Eigen/src | |
parent | abd1c1af7a568b067ca8cec8b8345a7a6f9d2c28 (diff) |
Make EIGEN_HAS_VARIADIC_TEMPLATES user configurable
Diffstat (limited to 'Eigen/src')
-rw-r--r-- | Eigen/src/Core/util/Macros.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index fe383ee9a..981873e70 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -381,11 +381,14 @@ #endif // Does the compiler support variadic templates? -#if EIGEN_MAX_CPP_VER>=11 && (__cplusplus > 199711L || EIGEN_COMP_MSVC >= 1900) -// Disable the use of variadic templates when compiling with nvcc on ARM devices: -// this prevents nvcc from crashing when compiling Eigen on Tegra X1 -#if !defined(__NVCC__) || !EIGEN_ARCH_ARM_OR_ARM64 +#ifndef EIGEN_HAS_VARIADIC_TEMPLATES +#if EIGEN_MAX_CPP_VER>=11 && (__cplusplus > 199711L || EIGEN_COMP_MSVC >= 1900) \ + && ( !defined(__NVCC__) || !EIGEN_ARCH_ARM_OR_ARM64 ) + // ^^ Disable the use of variadic templates when compiling with nvcc on ARM devices: + // this prevents nvcc from crashing when compiling Eigen on Tegra X1 #define EIGEN_HAS_VARIADIC_TEMPLATES 1 +#else +#define EIGEN_HAS_VARIADIC_TEMPLATES 0 #endif #endif |