Port sensor_manager of moveit_core to ROS 2.0 (#11)

moveit · Feb 20, 2019 · 5c0a336 · 5c0a336
1 parent 9f20d5f
commit 5c0a336
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/moveit_core/sensor_manager/CMakeLists.txt b/moveit_core/sensor_manager/CMakeLists.txt
@@ -1 +1 @@
-install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION})
+install(DIRECTORY include/ DESTINATION include)
diff --git a/moveit_core/sensor_manager/include/moveit/sensor_manager/sensor_manager.h b/moveit_core/sensor_manager/include/moveit/sensor_manager/sensor_manager.h
@@ -40,8 +40,8 @@
 #include <vector>
 #include <string>
 #include <moveit/macros/class_forward.h>
-#include <moveit_msgs/RobotTrajectory.h>
-#include <geometry_msgs/PointStamped.h>
+#include <moveit_msgs/msg/robot_trajectory.hpp>
+#include <geometry_msgs/msg/point_stamped.hpp>
 
 /// Namespace for the base class of a MoveIt! sensor manager
 namespace moveit_sensor_manager
@@ -99,8 +99,8 @@ class MoveItSensorManager
   /// of this function can perform checks on the safety of the trajectory.
   /// The function returns true on success (either completing execution succesfully or computing a trajecotory
   /// successufully)
-  virtual bool pointSensorTo(const std::string& name, const geometry_msgs::PointStamped& target,
-                             moveit_msgs::RobotTrajectory& sensor_trajectory) = 0;
+  virtual bool pointSensorTo(const std::string& name, const geometry_msgs::msg::PointStamped& target,
+                             moveit_msgs::msg::RobotTrajectory& sensor_trajectory) = 0;
 };
 }