From aa974399d04c5d632a4ea2ae05a7b65408a30c0c Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 11 May 2016 14:35:30 -0300 Subject: [PATCH] AP_Math: use inline wrappers for constrain_* functions This avoids some warnings about "constrain_float defined but not used" in some compilers. --- libraries/AP_Math/AP_Math.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Math/AP_Math.h b/libraries/AP_Math/AP_Math.h index a5b2022638..7d85826f5e 100644 --- a/libraries/AP_Math/AP_Math.h +++ b/libraries/AP_Math/AP_Math.h @@ -111,9 +111,20 @@ float wrap_2PI(const T radian); template T constrain_value(const T amt, const T low, const T high); -auto const constrain_float = &constrain_value; -auto const constrain_int16 = &constrain_value; -auto const constrain_int32 = &constrain_value; +inline float constrain_float(const float amt, const float low, const float high) +{ + return constrain_value(amt, low, high); +} + +inline int16_t constrain_int16(const int16_t amt, const int16_t low, const int16_t high) +{ + return constrain_value(amt, low, high); +} + +inline int32_t constrain_int32(const int32_t amt, const int32_t low, const int32_t high) +{ + return constrain_value(amt, low, high); +} // degrees -> radians static inline float radians(float deg)