Skip to content

Commit 3021d41

Browse files
authored
GPL custom validator: Use tl_expected from libexpected-dev instead (backport #2212) (#2238)
1 parent eef1e34 commit 3021d41

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

joint_trajectory_controller/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
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
)
2423

joint_trajectory_controller/include/joint_trajectory_controller/validate_jtc_parameters.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "parameter_traits/parameter_traits.hpp"
2222
#include "rclcpp/parameter.hpp"
2323
#include "rsl/algorithm.hpp"
24-
#include "tl_expected/expected.hpp"
24+
#include "tl/expected.hpp"
2525

2626
namespace joint_trajectory_controller
2727
{
@@ -33,7 +33,7 @@ tl::expected<void, std::string> command_interface_type_combinations(
3333
// Check if command interfaces combination is valid. Valid combinations are:
3434
// 1. effort
3535
// 2. velocity
36-
// 2. position [velocity, [acceleration]]
36+
// 3. position [velocity, [acceleration]]
3737

3838
if (
3939
rsl::contains<std::vector<std::string>>(interface_types, "velocity") &&

joint_trajectory_controller/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<depend>control_toolbox</depend>
2525
<depend>generate_parameter_library</depend>
2626
<depend>hardware_interface</depend>
27+
<depend>libexpected-dev</depend>
2728
<depend>pluginlib</depend>
2829
<depend>rclcpp</depend>
2930
<depend>rclcpp_action</depend>
3031
<depend>rclcpp_lifecycle</depend>
3132
<depend>realtime_tools</depend>
3233
<depend>rsl</depend>
33-
<depend>tl_expected</depend>
3434
<depend>trajectory_msgs</depend>
3535

3636
<test_depend>ament_cmake_gmock</test_depend>

0 commit comments

Comments
 (0)