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

SimpleTrackedVehiclePlugin: fix for boost 1.74 #2862

Merged
merged 1 commit into from
Oct 27, 2020

Conversation

scpeters
Copy link
Member

Our macOS builds are failing since homebrew updated to boost 1.74 in Homebrew/homebrew-core#62549:

plugins/SimpleTrackedVehiclePlugin.cc:35:7: error: redefinition of 'hash<boost::shared_ptr<T> >'
class hash<boost::shared_ptr<T>> {
      ^~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/local/include/boost/smart_ptr/shared_ptr.hpp:1174:26: note: previous definition is here
template<class T> struct hash< ::boost::shared_ptr<T> >
                         ^

It looks like shared_ptr.hpp has changed in 1.74.0. I've disabled some code in SimpleTrackedVehiclePlugin for boost 1.74 or greater, which seems to fix this.

Disable some code in SimpleTrackedVehiclePlugin for boost 1.74
or greater due to changes in boost shared_ptr.hpp

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Copy link
Member Author

@ahcorde
Copy link
Contributor

ahcorde commented Oct 26, 2020

@osrf-jenkins retest this please

@j-rivero
Copy link
Contributor

It looks like shared_ptr.hpp has changed in 1.74.0.

This seems correct. Changes in 1.74.0

    Added owner_equals to shared_ptr, weak_ptr, local_shared_ptr
    Added owner_hash_value to shared_ptr, weak_ptr
    Added owner_equal_to, owner_hash
    Added std::hash specializations for shared_ptr, local_shared_ptr
    Added boost::hash support to, and std::hash, std::equal_to specializations for, weak_ptr

@scpeters
Copy link
Member Author

none of the test failures are related to this PR; merging

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants