From afaf7e2c3fa4e66a2ad327ff34b363c733c8919b Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 4 Jun 2024 18:26:20 -0700 Subject: [PATCH] [upstream_utils] Format Eigen patches with Eigen's clang-format config (#6699) --- upstream_utils/eigen_patches/0001-Disable-warnings.patch | 4 ++-- .../eigen/include/Eigen/src/Core/util/DisableStupidWarnings.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/upstream_utils/eigen_patches/0001-Disable-warnings.patch b/upstream_utils/eigen_patches/0001-Disable-warnings.patch index 99c76fe679..387e226697 100644 --- a/upstream_utils/eigen_patches/0001-Disable-warnings.patch +++ b/upstream_utils/eigen_patches/0001-Disable-warnings.patch @@ -15,10 +15,10 @@ index 32a427d852355a51dc4263d81498554ff4c3cbba..9f3e3f5b0f15518377c9a8283fd58081 // See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89325 #pragma GCC diagnostic ignored "-Wattributes" #endif -+#if __GNUC__>=11 && __GNUC__<=13 ++#if __GNUC__ >= 11 && __GNUC__ <= 13 +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif -+#if __GNUC__>=12 ++#if __GNUC__ >= 12 +#pragma GCC diagnostic ignored "-Warray-bounds" +#endif #endif diff --git a/wpimath/src/main/native/thirdparty/eigen/include/Eigen/src/Core/util/DisableStupidWarnings.h b/wpimath/src/main/native/thirdparty/eigen/include/Eigen/src/Core/util/DisableStupidWarnings.h index 8012f683e5..60a1f06317 100644 --- a/wpimath/src/main/native/thirdparty/eigen/include/Eigen/src/Core/util/DisableStupidWarnings.h +++ b/wpimath/src/main/native/thirdparty/eigen/include/Eigen/src/Core/util/DisableStupidWarnings.h @@ -81,10 +81,10 @@ // See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89325 #pragma GCC diagnostic ignored "-Wattributes" #endif -#if __GNUC__>=11 && __GNUC__<=13 +#if __GNUC__ >= 11 && __GNUC__ <= 13 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif -#if __GNUC__>=12 +#if __GNUC__ >= 12 #pragma GCC diagnostic ignored "-Warray-bounds" #endif #endif