Skip to content

Remove explicit template parameter in spin_until_future_complete#72

Merged
jacobperron merged 2 commits intoros-visualization:ros2from
naiveHobo:fix
Jun 9, 2020
Merged

Remove explicit template parameter in spin_until_future_complete#72
jacobperron merged 2 commits intoros-visualization:ros2from
naiveHobo:fix

Conversation

@naiveHobo
Copy link
Copy Markdown
Contributor

Signed-off-by: Sarthak Mittal sarthakmittal2608@gmail.com

As per ros2/rclcpp#972 and ros2/rclcpp#1113, spin_until_future_complete should be able to accept both std::future and std::shared_future. This is the only downstream error blocking the original PR, I believe making the fix here is a better option.

Signed-off-by: Sarthak Mittal <sarthakmittal2608@gmail.com>
Signed-off-by: Sarthak Mittal <sarthakmittal2608@gmail.com>
@naiveHobo naiveHobo changed the title Update template parameter from MockInteractiveMarkerClient::SharedResponse to MockInteractiveMarkerClient::SharedFuture Remove explicit template parameter in spin_until_future_received Jun 9, 2020
@ivanpauno
Copy link
Copy Markdown
Contributor

@jacobperron I don't have enough powers in this repo to merge.
Can you review/merge this please? Thanks!

@jacobperron jacobperron self-requested a review June 9, 2020 16:36
@jacobperron jacobperron self-assigned this Jun 9, 2020
Copy link
Copy Markdown
Contributor

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

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

LGTM (pending CI), thanks!

@naiveHobo naiveHobo changed the title Remove explicit template parameter in spin_until_future_received Remove explicit template parameter in spin_until_future_complete Jun 9, 2020
@jacobperron jacobperron merged commit 0c68e81 into ros-visualization:ros2 Jun 9, 2020
jacobperron pushed a commit that referenced this pull request Jun 9, 2020
* Fix interactive marker server test

Signed-off-by: Sarthak Mittal <sarthakmittal2608@gmail.com>

* Remove explicit template specialization

Signed-off-by: Sarthak Mittal <sarthakmittal2608@gmail.com>
@naiveHobo naiveHobo deleted the fix branch June 9, 2020 18:24
jacobperron added a commit that referenced this pull request Jun 23, 2020
…) (#73)

* Fix interactive marker server test

Signed-off-by: Sarthak Mittal <sarthakmittal2608@gmail.com>

* Remove explicit template specialization

Signed-off-by: Sarthak Mittal <sarthakmittal2608@gmail.com>

Co-authored-by: Sarthak Mittal <sarthakmittal2608@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