From 30639fde4584b5c4529a5ad535545202ea140fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Tue, 24 Mar 2026 19:30:01 +0100
Subject: [PATCH 1/3] Use tl_expected from libexpected-dev instead (#572)

(cherry picked from commit 88f5298554e1f1787e2315b3eed54826952b26e9)

# Conflicts:
#	.github/workflows/rolling-semi-binary-build-win.yml
#	package.xml
---
 .github/workflows/rolling-semi-binary-build-win.yml | 4 ++++
 include/control_filters/custom_validators.hpp       | 2 +-
 package.xml                                         | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rolling-semi-binary-build-win.yml b/.github/workflows/rolling-semi-binary-build-win.yml
index 4feaab9c..b0a47b4c 100644
--- a/.github/workflows/rolling-semi-binary-build-win.yml
+++ b/.github/workflows/rolling-semi-binary-build-win.yml
@@ -31,3 +31,7 @@ jobs:
       ros_distro: rolling
       ref_for_scheduled_build: master
       pixi_dependencies: typeguard jinja2 boost compilers cpp-expected
+<<<<<<< HEAD
+=======
+      ninja_packages: rsl
+>>>>>>> 88f5298 (Use tl_expected from libexpected-dev instead (#572))
diff --git a/include/control_filters/custom_validators.hpp b/include/control_filters/custom_validators.hpp
index e318bd2d..12d4f981 100644
--- a/include/control_filters/custom_validators.hpp
+++ b/include/control_filters/custom_validators.hpp
@@ -21,7 +21,7 @@
 
 #include <rclcpp/rclcpp.hpp>
 #include <rsl/parameter_validators.hpp>
-#include <tl_expected/expected.hpp>
+#include <tl/expected.hpp>
 
 namespace control_filters {
 
diff --git a/package.xml b/package.xml
index e9985991..3d87a00a 100644
--- a/package.xml
+++ b/package.xml
@@ -26,10 +26,18 @@
   <depend>filters</depend>
   <depend>generate_parameter_library</depend>
   <depend>geometry_msgs</depend>
+  <depend>libexpected-dev</depend>
   <depend>pluginlib</depend>
   <depend>rclcpp</depend>
   <depend>rcutils</depend>
   <depend>realtime_tools</depend>
+<<<<<<< HEAD:package.xml
+=======
+  <depend>rsl</depend>
+  <depend>tf2</depend>
+  <depend>tf2_ros</depend>
+  <depend>tf2_geometry_msgs</depend>
+>>>>>>> 88f5298 (Use tl_expected from libexpected-dev instead (#572)):control_toolbox/package.xml
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>ament_cmake_gtest</test_depend>

From 882f64c96a7507eef2a8c474d1c8ffbf6964d660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Thu, 26 Mar 2026 08:31:20 +0100
Subject: [PATCH 2/3] Update rolling-semi-binary-build-win.yml

---
 .github/workflows/rolling-semi-binary-build-win.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/rolling-semi-binary-build-win.yml b/.github/workflows/rolling-semi-binary-build-win.yml
index b0a47b4c..4feaab9c 100644
--- a/.github/workflows/rolling-semi-binary-build-win.yml
+++ b/.github/workflows/rolling-semi-binary-build-win.yml
@@ -31,7 +31,3 @@ jobs:
       ros_distro: rolling
       ref_for_scheduled_build: master
       pixi_dependencies: typeguard jinja2 boost compilers cpp-expected
-<<<<<<< HEAD
-=======
-      ninja_packages: rsl
->>>>>>> 88f5298 (Use tl_expected from libexpected-dev instead (#572))

From cf7e88e1db69d23df5fdef02769394274b72a955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Thu, 26 Mar 2026 08:31:52 +0100
Subject: [PATCH 3/3] Update package.xml

---
 package.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package.xml b/package.xml
index 3d87a00a..168feec1 100644
--- a/package.xml
+++ b/package.xml
@@ -31,13 +31,7 @@
   <depend>rclcpp</depend>
   <depend>rcutils</depend>
   <depend>realtime_tools</depend>
-<<<<<<< HEAD:package.xml
-=======
   <depend>rsl</depend>
-  <depend>tf2</depend>
-  <depend>tf2_ros</depend>
-  <depend>tf2_geometry_msgs</depend>
->>>>>>> 88f5298 (Use tl_expected from libexpected-dev instead (#572)):control_toolbox/package.xml
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>ament_cmake_gtest</test_depend>