Skip to content

Revert "Revert "Allow spin_until_future_complete to accept std::future (#1113)" (#1159)"#1160

Merged
ivanpauno merged 1 commit intomasterfrom
ivanpauno/revert-#1113
Jun 10, 2020
Merged

Revert "Revert "Allow spin_until_future_complete to accept std::future (#1113)" (#1159)"#1160
ivanpauno merged 1 commit intomasterfrom
ivanpauno/revert-#1113

Conversation

@ivanpauno
Copy link
Copy Markdown
Member

Reverts #1159.

After ros-visualization/interactive_markers#72, we can safely apply #1113 again.

As commented in #1113 (comment), we can also consider an API compatible version, though I consider breaking API preferred in this case (the non-breaking API version is a bit unclean).

@ivanpauno ivanpauno added the in review Waiting for review (Kanban column) label Jun 9, 2020
@ivanpauno ivanpauno requested a review from dirk-thomas June 9, 2020 18:42
@ivanpauno ivanpauno self-assigned this Jun 9, 2020
#1113)" (#1159)"

This reverts commit bba9dce.

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Copy link
Copy Markdown
Member

@dirk-thomas dirk-thomas left a comment

Choose a reason for hiding this comment

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

Sounds good to me.

Please make sure a note about the API break gets added for Galactic (which @cottsay needs to create the page stub for).

@ivanpauno
Copy link
Copy Markdown
Member Author

ivanpauno commented Jun 9, 2020

Full CI:

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

@ivanpauno
Copy link
Copy Markdown
Member Author

ivanpauno commented Jun 10, 2020

Re-triggering Windows, as I can't grok a list of 1000+ failures to check if they are unrelated or not (we should have less failures now, after cpplint was pinned):

  • Windows Build Status (unrelated failures)

@ivanpauno ivanpauno merged commit 0fa68d5 into master Jun 10, 2020
@ivanpauno ivanpauno deleted the ivanpauno/revert-#1113 branch June 29, 2020 20:34
DensoADAS pushed a commit to DensoADAS/rclcpp that referenced this pull request Jul 7, 2020
ros2#1113)" (ros2#1159)" (ros2#1160)

This reverts commit bba9dce.

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

in review Waiting for review (Kanban column)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants