diff options
| author | Yi Kong <yikong@google.com> | 2022-02-25 16:32:14 +0800 |
|---|---|---|
| committer | Yi Kong <yikong@google.com> | 2022-02-25 15:08:55 +0000 |
| commit | 2aab794c004027d008d6b0b64165bf1961d5d2bb (patch) | |
| tree | 83bb8f19c67bcafdb2ca4a98414af1b17392ec36 /Eigen/src/Core/util/ReenableStupidWarnings.h | |
| parent | ca5aa72016f062fd0712bcb86370478de332bca3 (diff) | |
| download | eigen-2aab794c004027d008d6b0b64165bf1961d5d2bb.tar.gz | |
Upgrade eigen to 3.4.0
Steps:
* Removed common files between Android copy and the matching upstream copy
* Obtained latest upstream tarball (see README.version)
* Extracted over the directory
Bug: 148287349
Test: presubmit
Change-Id: Iee2744719075fdf000b315e973645923da766111
Diffstat (limited to 'Eigen/src/Core/util/ReenableStupidWarnings.h')
| -rw-r--r-- | Eigen/src/Core/util/ReenableStupidWarnings.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/ReenableStupidWarnings.h b/Eigen/src/Core/util/ReenableStupidWarnings.h index 86b60f52f..1ce6fd1b0 100644 --- a/Eigen/src/Core/util/ReenableStupidWarnings.h +++ b/Eigen/src/Core/util/ReenableStupidWarnings.h @@ -1,4 +1,8 @@ -#ifdef EIGEN_WARNINGS_DISABLED +#ifdef EIGEN_WARNINGS_DISABLED_2 +// "DisableStupidWarnings.h" was included twice recursively: Do not reenable warnings yet! +# undef EIGEN_WARNINGS_DISABLED_2 + +#elif defined(EIGEN_WARNINGS_DISABLED) #undef EIGEN_WARNINGS_DISABLED #ifndef EIGEN_PERMANENTLY_DISABLE_STUPID_WARNINGS @@ -8,7 +12,7 @@ #pragma warning pop #elif defined __clang__ #pragma clang diagnostic pop - #elif defined __GNUC__ && __GNUC__>=6 + #elif defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) #pragma GCC diagnostic pop #endif |