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

Fix usages of std::min and std::max to be windows safe (#4887)

Browse Source
This commit is contained in:
Thad House
2022-12-31 12:00:45 -08:00
committed by GitHub
parent c11bd2720f
commit b632b288a3
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/src/main/native/sim/MockHooks.cpp
View File

@@ -122,7 +122,7 @@ void HALSIM_StepTiming(uint64_t delta) {
int32_t status = 0;
uint64_t curTime = HAL_GetFPGATime(&status);
uint64_t nextTimeout = HALSIM_GetNextNotifierTimeout();
uint64_t step = std::min(delta, nextTimeout - curTime);
uint64_t step = (std::min)(delta, nextTimeout - curTime);
StepTiming(step);
delta -= step;