diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-05-19 15:21:53 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-05-19 15:21:53 +0200 |
| commit | 73693b5de671e1a32a3c2635aa6c64974cb5555c (patch) | |
| tree | f6498bb679510770b22c4c849b33e9a6689cef22 /Eigen | |
| parent | df9a5e13c67ae09ec1e942763f02d1a5500c091e (diff) | |
bug #1221: disable gcc 6 warning: ignoring attributes on template argument
Diffstat (limited to 'Eigen')
| -rwxr-xr-x | Eigen/src/Core/util/DisableStupidWarnings.h | 8 | ||||
| -rw-r--r-- | Eigen/src/Core/util/ReenableStupidWarnings.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Eigen/src/Core/util/DisableStupidWarnings.h b/Eigen/src/Core/util/DisableStupidWarnings.h index cb27acff7..c2533c34c 100755 --- a/Eigen/src/Core/util/DisableStupidWarnings.h +++ b/Eigen/src/Core/util/DisableStupidWarnings.h @@ -41,6 +41,14 @@ #pragma clang diagnostic push #endif #pragma clang diagnostic ignored "-Wconstant-logical-operand" + +#elif defined __GNUC__ && __GNUC__>=6 + + #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS + #pragma GCC diagnostic push + #endif + #pragma GCC diagnostic ignored "-Wignored-attributes" + #endif #if defined __NVCC__ diff --git a/Eigen/src/Core/util/ReenableStupidWarnings.h b/Eigen/src/Core/util/ReenableStupidWarnings.h index a23fab198..5d1bbeef6 100644 --- a/Eigen/src/Core/util/ReenableStupidWarnings.h +++ b/Eigen/src/Core/util/ReenableStupidWarnings.h @@ -8,6 +8,8 @@ #pragma warning pop #elif defined __clang__ #pragma clang diagnostic pop + #elif defined __GNUC__ && __GNUC__>=6 + #pragma GCC diagnostic pop #endif #if defined __NVCC__ @@ -19,6 +21,7 @@ // #pragma diag_default 2651 // #pragma diag_default 2653 #endif + #endif #endif // EIGEN_WARNINGS_DISABLED |