From 2be6666a2b323b2b299335928bc8f6841658a90d Mon Sep 17 00:00:00 2001 From: Ryuichi YAMAMOTO Date: Thu, 14 Jan 2016 00:14:08 +0900 Subject: [PATCH] Fix Eigen::allocator_type for std::map This was causing a static assert while building the PCL with the latest openmp-enabled clang/libcxx (3.8.0-trunk) on osx 10.10. CMake build options I used: ``` cmake -DPCL_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release .. ``` ref: http://eigen.tuxfamily.org/dox/classEigen_1_1aligned__allocator.html --- features/include/pcl/features/impl/pfh.hpp | 2 +- features/include/pcl/features/pfh.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/include/pcl/features/impl/pfh.hpp b/features/include/pcl/features/impl/pfh.hpp index e23bcf84e25..263380e1c05 100644 --- a/features/include/pcl/features/impl/pfh.hpp +++ b/features/include/pcl/features/impl/pfh.hpp @@ -94,7 +94,7 @@ pcl::PFHEstimation::computePointPFHSignature ( key = std::pair (p1, p2); // Check to see if we already estimated this pair in the global hashmap - std::map, Eigen::Vector4f, std::less >, Eigen::aligned_allocator >::iterator fm_it = feature_map_.find (key); + std::map, Eigen::Vector4f, std::less >, Eigen::aligned_allocator, Eigen::Vector4f> > >::iterator fm_it = feature_map_.find (key); if (fm_it != feature_map_.end ()) pfh_tuple_ = fm_it->second; else diff --git a/features/include/pcl/features/pfh.h b/features/include/pcl/features/pfh.h index 70bd20c8b60..fa1355c9057 100644 --- a/features/include/pcl/features/pfh.h +++ b/features/include/pcl/features/pfh.h @@ -208,7 +208,7 @@ namespace pcl float d_pi_; /** \brief Internal hashmap, used to optimize efficiency of redundant computations. */ - std::map, Eigen::Vector4f, std::less >, Eigen::aligned_allocator > feature_map_; + std::map, Eigen::Vector4f, std::less >, Eigen::aligned_allocator, Eigen::Vector4f> > > feature_map_; /** \brief Queue of pairs saved, used to constrain memory usage. */ std::queue > key_list_;