From 082b49e54e8ad5b156567751a028ef7ccfb5fd39 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/2] Use tl_expected from libexpected-dev instead (#572)

(cherry picked from commit 88f5298554e1f1787e2315b3eed54826952b26e9)

# Conflicts:
#	.github/workflows/rolling-semi-binary-build-win.yml
---
 .github/workflows/rolling-semi-binary-build-win.yml           | 4 ++++
 control_toolbox/include/control_filters/custom_validators.hpp | 2 +-
 control_toolbox/package.xml                                   | 2 ++
 3 files changed, 7 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/control_toolbox/include/control_filters/custom_validators.hpp b/control_toolbox/include/control_filters/custom_validators.hpp
index 7a4db439..0d9c4af9 100644
--- a/control_toolbox/include/control_filters/custom_validators.hpp
+++ b/control_toolbox/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/control_toolbox/package.xml b/control_toolbox/package.xml
index 5b5d3aca..20d0d874 100644
--- a/control_toolbox/package.xml
+++ b/control_toolbox/package.xml
@@ -31,10 +31,12 @@
   <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>
+  <depend>rsl</depend>
   <depend>tf2</depend>
   <depend>tf2_ros</depend>
   <depend>tf2_geometry_msgs</depend>

From dd913ccfed0f7276491372febfb415c7fa051f7d 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:30:48 +0100
Subject: [PATCH 2/2] 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))