Fix compilation with latest ROS 2 source (#605)

* Include tf2_ros/buffer.h where needed After some cleanup in ros2/geometry2#325, the header is no longer being transitively included. Signed-off-by: Jacob Perron <[email protected]> * Fix deprecated usage of FutureReturnCode The namespace rclcpp::executors:: was deprecated in Foxy and removed in ros2/rclcpp#1327. Signed-off-by: Jacob Perron <[email protected]>
cra-ros-pkg · Oct 26, 2020 · 7906d64 · 7906d64
1 parent a1055b9
commit 7906d64
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/include/robot_localization/ros_robot_localization_listener.hpp b/include/robot_localization/ros_robot_localization_listener.hpp
@@ -38,6 +38,7 @@
 #include <message_filters/time_synchronizer.h>
 #include <nav_msgs/msg/odometry.hpp>
 #include <geometry_msgs/msg/accel_with_covariance_stamped.hpp>
+#include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
 
 #include <memory>

diff --git a/test/test_ekf_localization_node_interfaces.cpp b/test/test_ekf_localization_node_interfaces.cpp
@@ -88,7 +88,7 @@ void resetFilter(rclcpp::Node::SharedPtr node_)
   double deltaY = 0.0;
   double deltaZ = 0.0;
 
-  if (ret == rclcpp::executor::FutureReturnCode::SUCCESS) {
+  if (ret == rclcpp::FutureReturnCode::SUCCESS) {
     // timing and spinning has been changed as per ros2
     rclcpp::Rate(2).sleep();
     rclcpp::spin_some(node_);

diff --git a/test/test_ukf_localization_node_interfaces.cpp b/test/test_ukf_localization_node_interfaces.cpp
@@ -88,7 +88,7 @@ void resetFilter(rclcpp::Node::SharedPtr node_)
   double deltaY = 0.0;
   double deltaZ = 0.0;
   // Timing and spinning is updated as per ros2
-  if (ret == rclcpp::executor::FutureReturnCode::SUCCESS) {
+  if (ret == rclcpp::FutureReturnCode::SUCCESS) {
     rclcpp::Rate(2).sleep();
     rclcpp::spin_some(node_);
     deltaX = filtered_.pose.pose.position.x -