diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-12 22:42:33 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-12 22:42:33 -0700 |
| commit | 7e4a6754b24eb185921593885f44f3c09fdc4808 (patch) | |
| tree | 08a01f8f034b6ca35102400002505707618521b5 /Eigen/src/Core/util/Macros.h | |
| parent | 5c68051cd7941a83de4c9dcc18a437e4a800ed12 (diff) | |
| parent | e74612b9a02f5fd7aa202b2b7f58bbf2af2a2f7f (diff) | |
Merged eigen/eigen into default
Diffstat (limited to 'Eigen/src/Core/util/Macros.h')
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index d65f92532..318ab9477 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -392,8 +392,8 @@ // Does the compiler support variadic templates? #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: + && ( !defined(__NVCC__) || !EIGEN_ARCH_ARM_OR_ARM64 || (defined __CUDACC_VER__ && __CUDACC_VER__ >= 80000) ) + // ^^ Disable the use of variadic templates when compiling with versions of nvcc older than 8.0 on ARM devices: // this prevents nvcc from crashing when compiling Eigen on Tegra X1 #define EIGEN_HAS_VARIADIC_TEMPLATES 1 #else |