Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpimath] Make unit max and min constexpr (#6690)

Browse Source
This commit is contained in:
Tyler Veness
2024-06-02 21:45:02 -07:00
committed by GitHub
parent 21e970f2cd
commit bdc42532ed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpimath/src/main/native/include/units/base.h
View File

@@ -3408,7 +3408,7 @@ namespace units {
// the "_min" user-defined literal in time.h.
template<class UnitTypeLhs, class UnitTypeRhs>
UnitTypeLhs (min)(const UnitTypeLhs& lhs, const UnitTypeRhs& rhs)
constexpr UnitTypeLhs (min)(const UnitTypeLhs& lhs, const UnitTypeRhs& rhs)
{
static_assert(traits::is_convertible_unit_t<UnitTypeLhs, UnitTypeRhs>::value, "Unit types are not compatible.");
UnitTypeLhs r(rhs);
@@ -3416,7 +3416,7 @@ namespace units {
}
template<class UnitTypeLhs, class UnitTypeRhs>
UnitTypeLhs (max)(const UnitTypeLhs& lhs, const UnitTypeRhs& rhs)
constexpr UnitTypeLhs (max)(const UnitTypeLhs& lhs, const UnitTypeRhs& rhs)
{
static_assert(traits::is_convertible_unit_t<UnitTypeLhs, UnitTypeRhs>::value, "Unit types are not compatible.");
UnitTypeLhs r(rhs);