Use tl_expected from libexpected-dev instead (#572)

christophfroehlich · mergify[bot] · commit 082b49e54e8a · 2026-03-26T07:28:45.000Z
(cherry picked from commit 88f5298) # Conflicts: # .github/workflows/rolling-semi-binary-build-win.yml
diff --git 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
@@ -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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`#include <rclcpp/rclcpp.hpp>`
`23`	`23`	`#include <rsl/parameter_validators.hpp>`
`24`		`-#include <tl_expected/expected.hpp>`
	`24`	`+#include <tl/expected.hpp>`
`25`	`25`
`26`	`26`	`namespace control_filters`
`27`	`27`	`{`