Skip to content

Commit a012272

Browse files
authored
fix deprecated header file in humble and jazzy (#10)
* fix deprecated header file in humble and jazzy * fix the memory leak bug! no more random crash of rviz2
1 parent ef5893e commit a012272

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

waypoint_navigation_plugin/cmake/ROS2.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ find_package(rviz_common REQUIRED)
2121
find_package(rviz_default_plugins REQUIRED)
2222
find_package(rviz_rendering REQUIRED)
2323
find_package(rosbag2_cpp REQUIRED)
24+
find_package(rosbag2_storage REQUIRED)
2425
find_package(mav_manager_srv REQUIRED)
2526
find_package(rviz_ogre_vendor REQUIRED)
2627
find_package(std_srvs REQUIRED)

waypoint_navigation_plugin/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<depend condition="$ROS_VERSION == 2">rviz_rendering</depend>
2525
<depend condition="$ROS_VERSION == 2">sensor_msgs</depend>
2626
<depend condition="$ROS_VERSION == 2">rosbag2_cpp</depend>
27+
<depend condition="$ROS_VERSION == 2">rosbag2_storage</depend>
2728
<depend condition="$ROS_VERSION == 2">mav_manager_srv</depend>
2829

2930
<build_depend condition="$ROS_VERSION == 2">qtbase5-dev</build_depend>

waypoint_navigation_plugin/src/waypoint_nav_frame_ros2.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
#include <rosbag2_cpp/writer.hpp>
6666
#include <rosbag2_cpp/reader.hpp>
6767
#include <rclcpp/serialization.hpp>
68-
#include <rosbag2_cpp/storage_options.hpp>
68+
#include <rosbag2_storage/storage_options.hpp>
6969
#include <OgrePrerequisites.h>
7070

7171
typedef struct {

waypoint_navigation_plugin/src/waypoint_nav_tool_ros2.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ WaypointNavTool::~WaypointNavTool()
7272

7373
delete frame_;
7474
delete frame_dock_;
75+
delete moving_flag_node_;
7576
}
7677

7778
void WaypointNavTool::onInitialize()

0 commit comments

Comments
 (0)