From 5ff68079e290174de168bbd332ad8ecdf70a3a7f Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 2 Aug 2024 18:47:27 -0700 Subject: [PATCH] [wpimath] Make SplineParameterizer constants inline (#6920) --- .../src/main/native/cpp/spline/SplineParameterizer.cpp | 9 --------- .../main/native/include/frc/spline/SplineParameterizer.h | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 wpimath/src/main/native/cpp/spline/SplineParameterizer.cpp diff --git a/wpimath/src/main/native/cpp/spline/SplineParameterizer.cpp b/wpimath/src/main/native/cpp/spline/SplineParameterizer.cpp deleted file mode 100644 index 73c475b535..0000000000 --- a/wpimath/src/main/native/cpp/spline/SplineParameterizer.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) FIRST and other WPILib contributors. -// Open Source Software; you can modify and/or share it under the terms of -// the WPILib BSD license file in the root directory of this project. - -#include "frc/spline/SplineParameterizer.h" - -constexpr units::meter_t frc::SplineParameterizer::kMaxDx; -constexpr units::meter_t frc::SplineParameterizer::kMaxDy; -constexpr units::radian_t frc::SplineParameterizer::kMaxDtheta; diff --git a/wpimath/src/main/native/include/frc/spline/SplineParameterizer.h b/wpimath/src/main/native/include/frc/spline/SplineParameterizer.h index 1b49656d6a..46bfc7148f 100644 --- a/wpimath/src/main/native/include/frc/spline/SplineParameterizer.h +++ b/wpimath/src/main/native/include/frc/spline/SplineParameterizer.h @@ -127,9 +127,9 @@ class WPILIB_DLLEXPORT SplineParameterizer { private: // Constraints for spline parameterization. - static constexpr units::meter_t kMaxDx = 5_in; - static constexpr units::meter_t kMaxDy = 0.05_in; - static constexpr units::radian_t kMaxDtheta = 0.0872_rad; + static inline constexpr units::meter_t kMaxDx = 5_in; + static inline constexpr units::meter_t kMaxDy = 0.05_in; + static inline constexpr units::radian_t kMaxDtheta = 0.0872_rad; struct StackContents { double t0;