fix(airlib): protect SafetyEval std::max from Windows macros - #9809
Open
Bartok9 wants to merge 1 commit into
Open
fix(airlib): protect SafetyEval std::max from Windows macros#9809Bartok9 wants to merge 1 commit into
Bartok9 wants to merge 1 commit into
Conversation
Parenthesize std::max in getDestination breaking-distance clamp so MSVC windows.h min/max macros cannot break the template call. No algorithm change. File already #undef max; parenthesize is the portable form used elsewhere. Signed-off-by: Bartok9 <danielrpike9@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
std::maxinSafetyEval::getDestinationbreaking-distance clamp.windows.hmin/max macro expansion from breaking the template call.Motivation
Bare
std::max(a, b)is unsafe when Windows headers definemaxas a macro (same class of fix as MultirotorApiBase lookahead protection in #9803 / portable subset of #4788). SafetyEval computes slam-braking destination distance with:No control gain or threshold change — operators and order are identical under
(std::max)(...).Verification
AirLib/src/safety/SafetyEval.cpp.Notes
aerial-drone-pr-campaign/specs/airsim/2026-07-23-2b-safetyeval-stdmax.mdAgent-Owner:
sera· Platform: hermes · Claim-TTL: 24h