Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change tl_expected for rcpputils #48

Merged
merged 3 commits into from
Feb 9, 2024
Merged

Change tl_expected for rcpputils #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f190da
Change tl_expected for rcpputils
ahcorde Feb 2, 2024
23bcb57
fix herader
ahcorde Feb 2, 2024
d0ef8bd
Merge branch 'rolling' into ahcorde/rolling/expected
ahcorde Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions point_cloud_transport/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(pluginlib REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rclcpp_components REQUIRED)
find_package(sensor_msgs REQUIRED)
find_package(tl_expected REQUIRED)
find_package(rcpputils REQUIRED)

# Build libpoint_cloud_transport
add_library(${PROJECT_NAME}
Expand All @@ -41,7 +41,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
message_filters::message_filters
rclcpp::rclcpp
${sensor_msgs_TARGETS}
tl_expected::tl_expected)
rcpputils::rcpputils)
target_link_libraries(${PROJECT_NAME} PRIVATE
pluginlib::pluginlib)

Expand Down Expand Up @@ -117,7 +117,7 @@ ament_export_include_directories("include/${PROJECT_NAME}")

ament_export_targets(export_${PROJECT_NAME})

ament_export_dependencies(message_filters rclcpp sensor_msgs pluginlib tl_expected)
ament_export_dependencies(message_filters rclcpp sensor_msgs pluginlib rcpputils)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion point_cloud_transport/include/point_cloud_transport/publisher_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#include "rclcpp/node.hpp"
#include <sensor_msgs/msg/point_cloud2.hpp>
#include <tl_expected/expected.hpp>
#include <rcpputils/tl_expected/expected.hpp>

#include <point_cloud_transport/single_subscriber_publisher.hpp>
#include "point_cloud_transport/visibility_control.hpp"
Expand Down
2 changes: 1 addition & 1 deletion point_cloud_transport/include/point_cloud_transport/simple_publisher_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include <rclcpp/rclcpp.hpp>
#include "rclcpp/serialization.hpp"
#include <sensor_msgs/msg/point_cloud2.hpp>
#include <tl_expected/expected.hpp>
#include <rcpputils/tl_expected/expected.hpp>

#include <point_cloud_transport/point_cloud_common.hpp>
#include <point_cloud_transport/publisher_plugin.hpp>
Expand Down
2 changes: 1 addition & 1 deletion point_cloud_transport/include/point_cloud_transport/subscriber_plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "rclcpp/macros.hpp"
#include "rclcpp/node.hpp"
#include <sensor_msgs/msg/point_cloud2.hpp>
#include <tl_expected/expected.hpp>
#include <rcpputils/tl_expected/expected.hpp>

#include <point_cloud_transport/transport_hints.hpp>

Expand Down
2 changes: 1 addition & 1 deletion point_cloud_transport/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<depend>pluginlib</depend>
<depend>rclcpp_components</depend>
<depend>rclcpp</depend>
<depend>rcpputils</depend>
<depend>sensor_msgs</depend>
<depend>tl_expected</depend>

<test_depend>ament_lint_common</test_depend>
<test_depend>ament_lint_auto</test_depend>
Expand Down
Loading