Skip to content

Use libexpected-dev instead of tl_expected (backport #322) #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christophfroehlich merged 1 commit into from
Mar 26, 2026
Merged

Use libexpected-dev instead of tl_expected (backport #322) #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ Here is an example custom validator.
#include <rclcpp/rclcpp.hpp>

#include <fmt/core.h>
#include <tl_expected/expected.hpp>
#include <tl/expected.hpp>

namespace my_project {

Expand Down
2 changes: 1 addition & 1 deletion example/include/generate_parameter_library_example/example_validators.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <string>

#include <rclcpp/rclcpp.hpp>
#include <tl_expected/expected.hpp>
#include <tl/expected.hpp>

namespace custom_validators {

Expand Down
13 changes: 12 additions & 1 deletion generate_parameter_library/cmake/generate_parameter_library.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,21 @@ macro(generate_parameter_library LIB_NAME YAML_FILE)
rclcpp_lifecycle::rclcpp_lifecycle
rsl::rsl
tcb_span::tcb_span
tl::expected
# for backward compatibility
# remove once this redirection is removed
# https://github.com/PickNikRobotics/cpp_polyfills/pull/12
tl_expected::tl_expected
)
install(DIRECTORY ${LIB_INCLUDE_DIR} DESTINATION include)
ament_export_dependencies(fmt parameter_traits rclcpp rclcpp_lifecycle rsl tcb_span tl_expected)
ament_export_dependencies(
fmt parameter_traits rclcpp rclcpp_lifecycle rsl tcb_span
tl-expected
# for backward compatibility
# remove once this redirection is removed
# https://github.com/PickNikRobotics/cpp_polyfills/pull/12
tl_expected
)
endmacro()


Expand Down
4 changes: 4 additions & 0 deletions generate_parameter_library/generate_parameter_library-extras.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ find_package(rclcpp REQUIRED)
find_package(rsl REQUIRED)
find_package(rclcpp_lifecycle REQUIRED)
find_package(tcb_span REQUIRED)
find_package(tl-expected REQUIRED)
# for backward compatibility
# remove once this redirection is removed
# https://github.com/PickNikRobotics/cpp_polyfills/pull/12
find_package(tl_expected REQUIRED)

include("${generate_parameter_library_DIR}/generate_parameter_library.cmake")
5 changes: 5 additions & 0 deletions generate_parameter_library/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
<depend>rclcpp_lifecycle</depend>
<depend>rsl</depend>
<depend>tcb_span</depend>
<depend>libexpected-dev</depend>

<!-- for backward compatibility -->
<!-- remove once this redirection is removed -->
<!-- https://github.com/PickNikRobotics/cpp_polyfills/pull/12 -->
<depend>tl_expected</depend>

<export>
Expand Down
Loading