From 13932c9559c77abd390e5fef7abe7c49bb9f2940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= <ahcorde@gmail.com>
Date: Fri, 9 Feb 2024 15:59:45 +0100
Subject: [PATCH] Change tl_expected for rcpputils (#48)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
---
 point_cloud_transport/CMakeLists.txt                        | 6 +++---
 .../include/point_cloud_transport/publisher_plugin.hpp      | 2 +-
 .../point_cloud_transport/simple_publisher_plugin.hpp       | 2 +-
 .../include/point_cloud_transport/subscriber_plugin.hpp     | 2 +-
 point_cloud_transport/package.xml                           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/point_cloud_transport/CMakeLists.txt b/point_cloud_transport/CMakeLists.txt
index a701458..5b39026 100644
--- a/point_cloud_transport/CMakeLists.txt
+++ b/point_cloud_transport/CMakeLists.txt
@@ -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}
@@ -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)
 
@@ -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)
diff --git a/point_cloud_transport/include/point_cloud_transport/publisher_plugin.hpp b/point_cloud_transport/include/point_cloud_transport/publisher_plugin.hpp
index c10f046..b0cefc3 100644
--- a/point_cloud_transport/include/point_cloud_transport/publisher_plugin.hpp
+++ b/point_cloud_transport/include/point_cloud_transport/publisher_plugin.hpp
@@ -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"
diff --git a/point_cloud_transport/include/point_cloud_transport/simple_publisher_plugin.hpp b/point_cloud_transport/include/point_cloud_transport/simple_publisher_plugin.hpp
index 0e5a15b..4f272d2 100644
--- a/point_cloud_transport/include/point_cloud_transport/simple_publisher_plugin.hpp
+++ b/point_cloud_transport/include/point_cloud_transport/simple_publisher_plugin.hpp
@@ -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>
diff --git a/point_cloud_transport/include/point_cloud_transport/subscriber_plugin.hpp b/point_cloud_transport/include/point_cloud_transport/subscriber_plugin.hpp
index b15b75f..47a4ae5 100644
--- a/point_cloud_transport/include/point_cloud_transport/subscriber_plugin.hpp
+++ b/point_cloud_transport/include/point_cloud_transport/subscriber_plugin.hpp
@@ -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>
 
diff --git a/point_cloud_transport/package.xml b/point_cloud_transport/package.xml
index d578678..b9d52f1 100644
--- a/point_cloud_transport/package.xml
+++ b/point_cloud_transport/package.xml
@@ -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>