Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 23:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Math: esp32 with esp_idf have MIN and MAX defined to something else.

Browse Source 
Author: Charles Villard <charlesvillard10@gmail.com>
Author: Buzz <davidbuzz@gmail.com>
This commit is contained in:
Buzz 2021-10-27 18:06:42 +10:00 committed by Andrew Tridgell
parent d4e2828540
commit adaccdf0ba
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Math/AP_Math.h
View File

@ -215,12 +215,14 @@ ftype norm(const T first, const U second, const Params... parameters)
return sqrtF(sq(first, second, parameters...)); return sqrtF(sq(first, second, parameters...));
} }
#undef MIN
template<typename A, typename B> template<typename A, typename B>
static inline auto MIN(const A &one, const B &two) -> decltype(one < two ? one : two) static inline auto MIN(const A &one, const B &two) -> decltype(one < two ? one : two)
{ {
return one < two ? one : two; return one < two ? one : two;
} }
#undef MAX
template<typename A, typename B> template<typename A, typename B>
static inline auto MAX(const A &one, const B &two) -> decltype(one > two ? one : two) static inline auto MAX(const A &one, const B &two) -> decltype(one > two ? one : two)
{ {