From 5123e8ecb34694a19454b7e22ed49a98ca51a516 Mon Sep 17 00:00:00 2001 From: Bartok9 Date: Tue, 28 Jul 2026 05:22:26 -0400 Subject: [PATCH] fix(mavlink): protect Utils clip/limitAbsValue from Windows min/max macros Parenthesize std::min/max so windows.h macros cannot break the templates. --- MavLinkCom/common_utils/Utils.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MavLinkCom/common_utils/Utils.hpp b/MavLinkCom/common_utils/Utils.hpp index b21d5c0b35..36aaff4567 100644 --- a/MavLinkCom/common_utils/Utils.hpp +++ b/MavLinkCom/common_utils/Utils.hpp @@ -153,8 +153,8 @@ class Utils static T limitAbsValue(T val, T min_value, T max_value) { T val_abs = std::abs(val); - T val_limited = std::max(val_abs, min_value); - val_limited = std::min(val_limited, max_value); + T val_limited = (std::max)(val_abs, min_value); + val_limited = (std::min)(val_limited, max_value); return sign(val) * val_limited; } @@ -162,7 +162,7 @@ class Utils template static T clip(T val, T min_value, T max_value) { - return std::max(min_value, std::min(val, max_value)); + return (std::max)(min_value, (std::min)(val, max_value)); } template