Skip to content

Commit 02d7a09

Browse files
authored
GPL custom validator: Use tl_expected from libexpected-dev instead (backport #2212) (#2239)
1 parent 7c696b5 commit 02d7a09

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

joint_trajectory_controller/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
1818
rclcpp_lifecycle
1919
realtime_tools
2020
rsl
21-
tl_expected
2221
trajectory_msgs
2322
urdf
2423
)
@@ -57,7 +56,6 @@ target_link_libraries(joint_trajectory_controller PUBLIC
5756
rclcpp_lifecycle::rclcpp_lifecycle
5857
realtime_tools::realtime_tools
5958
rsl::rsl
60-
tl_expected::tl_expected
6159
urdf::urdf
6260
angles::angles
6361
${trajectory_msgs_TARGETS}

joint_trajectory_controller/include/joint_trajectory_controller/validate_jtc_parameters.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "rclcpp/parameter.hpp"
2222
#include "rsl/algorithm.hpp"
23-
#include "tl_expected/expected.hpp"
23+
#include "tl/expected.hpp"
2424

2525
namespace joint_trajectory_controller
2626
{

joint_trajectory_controller/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<depend>control_toolbox</depend>
2727
<depend>generate_parameter_library</depend>
2828
<depend>hardware_interface</depend>
29+
<depend>libexpected-dev</depend>
2930
<depend>pluginlib</depend>
3031
<depend>rclcpp</depend>
3132
<depend>rclcpp_action</depend>
3233
<depend>rclcpp_lifecycle</depend>
3334
<depend>realtime_tools</depend>
3435
<depend>rsl</depend>
35-
<depend>tl_expected</depend>
3636
<depend>trajectory_msgs</depend>
3737
<depend>urdf</depend>
3838

0 commit comments

Comments
 (0)