diff options
| author |  Avi Ginsburg <avi.ginsburg@mail.huji.ac.il> | 2016-10-13 08:47:32 +0000 |
|---|---|---|
| committer | Avi Ginsburg <avi.ginsburg@mail.huji.ac.il> | 2016-10-13 08:47:32 +0000 |
| commit | ac63d6891ce87256de666c4d8f81eafaf99b8450 (patch) | |
| tree | 612b9365b50cd16a576afe6d55f9f7f14273df89 /Eigen | |
| parent | e74612b9a02f5fd7aa202b2b7f58bbf2af2a2f7f (diff) | |
Patch to allow VS2015 & CUDA 8.0 to compile with Eigen included. I'm not sure
whether to limit the check to this compiler combination
(` || (EIGEN_COMP_MSVC == 1900 && __CUDACC_VER__) `)
or to leave it as it is. I also don't know if this will have any affect on
including Eigen in device code (I'm not in my current project).
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 318ab9477..ce715716c 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -801,7 +801,7 @@ namespace Eigen { // just an empty macro ! #define EIGEN_EMPTY -#if EIGEN_COMP_MSVC_STRICT && EIGEN_COMP_MSVC < 1900 // for older MSVC versions using the base operator is sufficient (cf Bug 1000) +#if EIGEN_COMP_MSVC_STRICT && (EIGEN_COMP_MSVC < 1900 || __CUDACC_VER__) // for older MSVC versions, as well as 1900 && CUDA 8, using the base operator is sufficient (cf Bugs 1000, 1324) #define EIGEN_INHERIT_ASSIGNMENT_EQUAL_OPERATOR(Derived) \ using Base::operator =; #elif EIGEN_COMP_CLANG // workaround clang bug (see http://forum.kde.org/viewtopic.php?f=74&t=102653) |