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

Replace hash_map with unordered_map in 3rdparty/poisson4 #2640

Merged
merged 2 commits into from
Dec 7, 2018

Conversation

taketwo
Copy link
Member

@taketwo taketwo commented Nov 23, 2018

unordered_map was introduced in C++11, so this PR is to be merged after transition to the new standard.

Fixes #2639.

@taketwo taketwo added needs: pr merge Specify why not closed/merged yet module: surface labels Nov 23, 2018
@taketwo taketwo removed the needs: pr merge Specify why not closed/merged yet label Dec 7, 2018
@taketwo
Copy link
Member Author

taketwo commented Dec 7, 2018

Rebased on the current master.

@SergioRAgostinho
Copy link
Member

The build failed on Mac. These lines looks suspicious because of headers including hash_maps and requiring specific gcc extensions.

https://github.com/PointCloudLibrary/pcl/blob/master/surface/include/pcl/surface/3rdparty/poisson4/multi_grid_octree_data.hpp#L32-L65

@taketwo
Copy link
Member Author

taketwo commented Dec 7, 2018

This PR removes these lines, here is how the file looks with it:

https://github.com/PointCloudLibrary/pcl/blob/980825d55be6d43bb8502533768e0f52790fc5fd/surface/include/pcl/surface/3rdparty/poisson4/multi_grid_octree_data.hpp

I suspect these remaining lines are to blame:

#ifndef _MSC_VER
namespace std
{
using namespace __gnu_cxx;
}
#endif

Will kick them out.

@SergioRAgostinho SergioRAgostinho merged commit 4c8e8d2 into PointCloudLibrary:master Dec 7, 2018
@taketwo taketwo deleted the hash_map branch December 7, 2018 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants