fixing merge conflicts for release on humble sync 6 (#3623)

Author: SteveMacenski

nav2_behavior_tree/test/plugins/condition/test_is_battery_charging.cpp

@@ -20,7 +20,7 @@
 
 #include "sensor_msgs/msg/battery_state.hpp"
 
-#include "utils/test_behavior_tree_fixture.hpp"
+#include "../../test_behavior_tree_fixture.hpp"
 #include "nav2_behavior_tree/plugins/condition/is_battery_charging_condition.hpp"
 
 class IsBatteryChargingConditionTestFixture : public ::testing::Test

nav2_collision_monitor/include/nav2_collision_monitor/pointcloud.hpp

@@ -20,6 +20,7 @@
 #include <string>
 
 #include "sensor_msgs/msg/point_cloud2.hpp"
+#include "nav2_util/robot_utils.hpp"
 
 #include "nav2_collision_monitor/source.hpp"
 

nav2_collision_monitor/include/nav2_collision_monitor/range.hpp

@@ -20,6 +20,7 @@
 #include <string>
 
 #include "sensor_msgs/msg/range.hpp"
+#include "nav2_util/robot_utils.hpp"
 
 #include "nav2_collision_monitor/source.hpp"
 

nav2_collision_monitor/include/nav2_collision_monitor/scan.hpp

@@ -20,6 +20,7 @@
 #include <vector>
 
 #include "sensor_msgs/msg/laser_scan.hpp"
+#include "nav2_util/robot_utils.hpp"
 
 #include "nav2_collision_monitor/source.hpp"
 

nav2_costmap_2d/test/unit/costmap_filter_test.cpp

@@ -75,15 +75,15 @@ TEST(CostmapFilter, testWorldToMask)
   unsigned int mx, my;
   // Point inside mask
   ASSERT_TRUE(cf.worldToMask(mask, 4.0, 5.0, mx, my));
-  ASSERT_EQ(mx, 1);
-  ASSERT_EQ(my, 2);
+  ASSERT_EQ(mx, 1u);
+  ASSERT_EQ(my, 2u);
   // Corner cases
   ASSERT_TRUE(cf.worldToMask(mask, 3.0, 3.0, mx, my));
-  ASSERT_EQ(mx, 0);
-  ASSERT_EQ(my, 0);
+  ASSERT_EQ(mx, 0u);
+  ASSERT_EQ(my, 0u);
   ASSERT_TRUE(cf.worldToMask(mask, 5.9, 5.9, mx, my));
-  ASSERT_EQ(mx, 2);
-  ASSERT_EQ(my, 2);
+  ASSERT_EQ(mx, 2u);
+  ASSERT_EQ(my, 2u);
   // Point outside mask
   ASSERT_FALSE(cf.worldToMask(mask, 2.9, 2.9, mx, my));
   ASSERT_FALSE(cf.worldToMask(mask, 6.0, 6.0, mx, my));