Skip to content

Commit f2a7bcd

Browse files
committed
Use -Wmaybe-uninitialized in odometry header
1 parent 03e1f75 commit f2a7bcd

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

wpimath/src/main/native/include/frc/kinematics/SwerveDriveOdometry3d.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ class SwerveDriveOdometry3d
4848
const Pose2d& initialPose = Pose2d{})
4949
: SwerveDriveOdometry3d::Odometry3d(m_kinematicsImpl, gyroAngle,
5050
modulePositions, initialPose),
51+
#if defined(__GNUC__) && !defined(__clang__)
52+
#pragma GCC diagnostic push
53+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
54+
#endif // defined(__GNUC__) && !defined(__clang__)
5155
m_kinematicsImpl(kinematics) {
56+
#if defined(__GNUC__) && !defined(__clang__)
57+
#pragma GCC diagnostic pop
58+
#endif // defined(__GNUC__) && !defined(__clang__)
5259
wpi::math::MathSharedStore::ReportUsage(
5360
wpi::math::MathUsageId::kOdometry_SwerveDrive, 1);
5461
}

wpimath/src/test/native/cpp/kinematics/SwerveDriveOdometry3dTest.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,10 @@ class SwerveDriveOdometry3dTest : public ::testing::Test {
3131
};
3232

3333
TEST_F(SwerveDriveOdometry3dTest, Initialize) {
34-
#if defined(__GNUC__) && !defined(__clang__)
35-
#pragma GCC diagnostic push
36-
#pragma GCC diagnostic ignored "-Werror=maybe-uninitialized"
37-
#endif // defined(__GNUC__) && !defined(__clang__)
3834
SwerveDriveOdometry3d odometry{m_kinematics,
3935
0_rad,
4036
{zero, zero, zero, zero},
4137
frc::Pose2d{1_m, 2_m, 45_deg}};
42-
#if defined(__GNUC__) && !defined(__clang__)
43-
#pragma GCC diagnostic pop
44-
#endif // defined(__GNUC__) && !defined(__clang__)
4538

4639
const frc::Pose2d& pose = odometry.GetPose();
4740

0 commit comments

Comments
 (0)