Skip to content
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.

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

Included tl_expected #185

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Included tl_expected #185

merged 3 commits into from
Feb 5, 2024

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Feb 2, 2024

This PR is related with this other PR ros2/ros2#1516

The idea is to include tl_expected in rclcpp until the standard CXX20 is available in the ros distribution

FYI @tylerjw

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Copy link

@tylerjw tylerjw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sweet, looks good

Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor change, then we can run CI on this.

CMakeLists.txt Outdated
@@ -50,14 +51,41 @@ ament_export_dependencies(rcutils)

if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
find_package(ament_lint_auto REQUIRED)
# find_package(ament_lint_auto REQUIRED)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this please.

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde
Copy link
Contributor Author

ahcorde commented Feb 2, 2024

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@ahcorde ahcorde requested a review from clalancette February 2, 2024 21:45
@ahcorde ahcorde merged commit 2a5bfd5 into rolling Feb 5, 2024
3 checks passed
@ahcorde ahcorde deleted the ahcorde/rolling/tl_expected branch February 5, 2024 15:53
@ahcorde
Copy link
Contributor Author

ahcorde commented Feb 5, 2024

@clalancette can we also backport this to humble and iron ?

@ahcorde
Copy link
Contributor Author

ahcorde commented Feb 6, 2024

https://github.com/Mergifyio backport humble iron

Copy link

mergify bot commented Feb 6, 2024

backport humble iron

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Feb 6, 2024
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 2a5bfd5)

# Conflicts:
#	CMakeLists.txt
mergify bot pushed a commit that referenced this pull request Feb 6, 2024
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 2a5bfd5)
ahcorde added a commit that referenced this pull request Feb 8, 2024
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 2a5bfd5)

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
ahcorde pushed a commit that referenced this pull request Feb 12, 2024
* Included tl_expected (#185)

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 2a5bfd5)

# Conflicts:
#	CMakeLists.txt

* Fixed merge

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants