diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2018-09-27 09:28:57 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2018-09-27 09:28:57 +0200 |
| commit | af3ad4b5138697e3637dd5b9881f63fa53c5c7a0 (patch) | |
| tree | 219ff6a7796f74623698eb6f5a9d2e2574130029 /Eigen | |
| parent | 24b163a877d38affed000e0dfaa09908bc1279bf (diff) | |
oops, I've been too fast in previous copy/paste
Diffstat (limited to 'Eigen')
| -rwxr-xr-x | Eigen/src/Core/util/DisableStupidWarnings.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/util/ReenableStupidWarnings.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/DisableStupidWarnings.h b/Eigen/src/Core/util/DisableStupidWarnings.h index 7e4eaf37f..df6fcd63b 100755 --- a/Eigen/src/Core/util/DisableStupidWarnings.h +++ b/Eigen/src/Core/util/DisableStupidWarnings.h @@ -47,7 +47,7 @@ #elif defined __GNUC__ - #if (!defined(EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS)) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC__ >= 6)) + #if (!defined(EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS)) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) #pragma GCC diagnostic push #endif // g++ warns about local variables shadowing member functions, which is too strict diff --git a/Eigen/src/Core/util/ReenableStupidWarnings.h b/Eigen/src/Core/util/ReenableStupidWarnings.h index acbd42c01..1ce6fd1b0 100644 --- a/Eigen/src/Core/util/ReenableStupidWarnings.h +++ b/Eigen/src/Core/util/ReenableStupidWarnings.h @@ -12,7 +12,7 @@ #pragma warning pop #elif defined __clang__ #pragma clang diagnostic pop - #elif defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC__ >= 6)) + #elif defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) #pragma GCC diagnostic pop #endif |