From bdc42532edac33d0d06fbdae96b4856114a6c3d3 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sun, 2 Jun 2024 21:45:02 -0700 Subject: [PATCH] [wpimath] Make unit max and min constexpr (#6690) --- wpimath/src/main/native/include/units/base.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wpimath/src/main/native/include/units/base.h b/wpimath/src/main/native/include/units/base.h index e7333a91ee..0e9ae23768 100644 --- a/wpimath/src/main/native/include/units/base.h +++ b/wpimath/src/main/native/include/units/base.h @@ -3408,7 +3408,7 @@ namespace units { // the "_min" user-defined literal in time.h. template - UnitTypeLhs (min)(const UnitTypeLhs& lhs, const UnitTypeRhs& rhs) + constexpr UnitTypeLhs (min)(const UnitTypeLhs& lhs, const UnitTypeRhs& rhs) { static_assert(traits::is_convertible_unit_t::value, "Unit types are not compatible."); UnitTypeLhs r(rhs); @@ -3416,7 +3416,7 @@ namespace units { } template - UnitTypeLhs (max)(const UnitTypeLhs& lhs, const UnitTypeRhs& rhs) + constexpr UnitTypeLhs (max)(const UnitTypeLhs& lhs, const UnitTypeRhs& rhs) { static_assert(traits::is_convertible_unit_t::value, "Unit types are not compatible."); UnitTypeLhs r(rhs);