Skip to content

Commit 30639fd

Browse files
christophfroehlichmergify[bot]
authored andcommitted
Use tl_expected from libexpected-dev instead (#572)
(cherry picked from commit 88f5298) # Conflicts: # .github/workflows/rolling-semi-binary-build-win.yml # package.xml
1 parent cee2087 commit 30639fd

3 files changed

Lines changed: 13 additions & 1 deletion

File tree

.github/workflows/rolling-semi-binary-build-win.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ jobs:
3131
ros_distro: rolling
3232
ref_for_scheduled_build: master
3333
pixi_dependencies: typeguard jinja2 boost compilers cpp-expected
34+
<<<<<<< HEAD
35+
=======
36+
ninja_packages: rsl
37+
>>>>>>> 88f5298 (Use tl_expected from libexpected-dev instead (#572))

include/control_filters/custom_validators.hpp

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

2222
#include <rclcpp/rclcpp.hpp>
2323
#include <rsl/parameter_validators.hpp>
24-
#include <tl_expected/expected.hpp>
24+
#include <tl/expected.hpp>
2525

2626
namespace control_filters {
2727

package.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,18 @@
2626
<depend>filters</depend>
2727
<depend>generate_parameter_library</depend>
2828
<depend>geometry_msgs</depend>
29+
<depend>libexpected-dev</depend>
2930
<depend>pluginlib</depend>
3031
<depend>rclcpp</depend>
3132
<depend>rcutils</depend>
3233
<depend>realtime_tools</depend>
34+
<<<<<<< HEAD:package.xml
35+
=======
36+
<depend>rsl</depend>
37+
<depend>tf2</depend>
38+
<depend>tf2_ros</depend>
39+
<depend>tf2_geometry_msgs</depend>
40+
>>>>>>> 88f5298 (Use tl_expected from libexpected-dev instead (#572)):control_toolbox/package.xml
3341

3442
<test_depend>ament_cmake_gmock</test_depend>
3543
<test_depend>ament_cmake_gtest</test_depend>

0 commit comments

Comments
 (0)