From 79b6d529b85bd0f62e1ce5daaa5cc781700c3438 Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Tue, 6 Aug 2024 21:46:47 -0800 Subject: [PATCH] fix -Wdeprecated-enum-float-conversion in GeographicLib --- mavros/include/mavros/mavros_uas.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mavros/include/mavros/mavros_uas.hpp b/mavros/include/mavros/mavros_uas.hpp index 2aed4b41d..45e1c90e4 100644 --- a/mavros/include/mavros/mavros_uas.hpp +++ b/mavros/include/mavros/mavros_uas.hpp @@ -161,7 +161,7 @@ class Data inline double geoid_to_ellipsoid_height(const T lla) { if (egm96_5) { - return GeographicLib::Geoid::GEOIDTOELLIPSOID * (*egm96_5)(lla->latitude, lla->longitude); + return int(GeographicLib::Geoid::GEOIDTOELLIPSOID) * (*egm96_5)(lla->latitude, lla->longitude); } else { return 0.0; } @@ -181,7 +181,7 @@ class Data inline double ellipsoid_to_geoid_height(const T lla) { if (egm96_5) { - return GeographicLib::Geoid::ELLIPSOIDTOGEOID * (*egm96_5)(lla->latitude, lla->longitude); + return int(GeographicLib::Geoid::ELLIPSOIDTOGEOID) * (*egm96_5)(lla->latitude, lla->longitude); } else { return 0.0; }