Skip to content

fix(airlib): protect SafetyEval std::max from Windows macros #9809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bartok9 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(airlib): protect SafetyEval std::max from Windows macros #9809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AirLib/src/safety/SafetyEval.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ namespace airlib
{
//breaking distance at this velocity
float velocity_mag = velocity.norm();
float dest_pos_dist = std::max(velocity_mag * vehicle_params_.vel_to_breaking_dist,
float dest_pos_dist = (std::max)(velocity_mag * vehicle_params_.vel_to_breaking_dist,
vehicle_params_.min_breaking_dist);

//calculate dest_pos cur_pos we will be if we had to break suddenly
Expand Down