From 17ba946cb288439c383f61f42893c190a25af659 Mon Sep 17 00:00:00 2001 From: Heiko Thiel Date: Mon, 15 Jul 2019 02:06:51 +0200 Subject: [PATCH] Changes are done by run-clang-tidy -header-filter='.*' -checks='-*,modernize-use-transparent-functors' -fix --- .../apps/3d_rec_framework/pipeline/global_nn_recognizer_crh.h | 2 +- .../apps/3d_rec_framework/pipeline/global_nn_recognizer_cvfh.h | 2 +- .../3d_rec_framework/pipeline/impl/global_nn_recognizer_crh.hpp | 2 +- .../pipeline/impl/global_nn_recognizer_cvfh.hpp | 2 +- .../apps/3d_rec_framework/pipeline/impl/local_recognizer.hpp | 2 +- .../pcl/apps/3d_rec_framework/pipeline/local_recognizer.h | 2 +- features/include/pcl/features/impl/pfh.hpp | 2 +- features/include/pcl/features/pfh.h | 2 +- surface/include/pcl/surface/grid_projection.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_crh.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_crh.h index c8cf702181b..db2821395fc 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_crh.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_crh.h @@ -95,7 +95,7 @@ namespace pcl bool use_cache_; std::map, Eigen::Matrix4f, - std::less >, + std::less<>, Eigen::aligned_allocator, Eigen::Matrix4f> > > poses_cache_; std::map, Eigen::Vector3f > centroids_cache_; diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_cvfh.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_cvfh.h index 058439437a3..f300b9bd146 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_cvfh.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_cvfh.h @@ -133,7 +133,7 @@ namespace pcl bool use_cache_; std::map, Eigen::Matrix4f, - std::less >, + std::less<>, Eigen::aligned_allocator, Eigen::Matrix4f> > > poses_cache_; std::map, Eigen::Vector3f> centroids_cache_; diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_crh.hpp b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_crh.hpp index b8e205a1e9f..c28d211d1e2 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_crh.hpp +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_crh.hpp @@ -23,7 +23,7 @@ template class Distance, typename PointInT, typename FeatureT> mv_pair pair_model_view = std::make_pair (model.id_, view_id); std::map, + std::less<>, Eigen::aligned_allocator > >::iterator it = poses_cache_.find (pair_model_view); if (it != poses_cache_.end ()) diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_cvfh.hpp b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_cvfh.hpp index b60bbdc0fcf..abf0af3ce21 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_cvfh.hpp +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_cvfh.hpp @@ -22,7 +22,7 @@ template class Distance, typename PointInT, typename FeatureT> mv_pair pair_model_view = std::make_pair (model.id_, view_id); std::map, + std::less<>, Eigen::aligned_allocator > >::iterator it = poses_cache_.find (pair_model_view); if (it != poses_cache_.end ()) diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/local_recognizer.hpp b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/local_recognizer.hpp index 29da625766b..62f326ba9d5 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/local_recognizer.hpp +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/local_recognizer.hpp @@ -458,7 +458,7 @@ template class Distance, typename PointInT, typename FeatureT> mv_pair pair_model_view = std::make_pair (model.id_, view_id); std::map, + std::less<>, Eigen::aligned_allocator > >::iterator it = poses_cache_.find (pair_model_view); if (it != poses_cache_.end ()) diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/local_recognizer.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/local_recognizer.h index c61bb8af785..715bd99bffb 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/local_recognizer.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/local_recognizer.h @@ -87,7 +87,7 @@ namespace pcl bool use_cache_; std::map, Eigen::Matrix4f, - std::less >, + std::less<>, Eigen::aligned_allocator, Eigen::Matrix4f> > > poses_cache_; std::map, typename pcl::PointCloud::Ptr> keypoints_cache_; diff --git a/features/include/pcl/features/impl/pfh.hpp b/features/include/pcl/features/impl/pfh.hpp index 9c1282bf787..951e2d78c29 100644 --- a/features/include/pcl/features/impl/pfh.hpp +++ b/features/include/pcl/features/impl/pfh.hpp @@ -96,7 +96,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, Eigen::Vector4f> > >::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; diff --git a/features/include/pcl/features/pfh.h b/features/include/pcl/features/pfh.h index 97a40cc9fa5..ddfe075e603 100644 --- a/features/include/pcl/features/pfh.h +++ b/features/include/pcl/features/pfh.h @@ -204,7 +204,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, Eigen::Vector4f> > > 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_; diff --git a/surface/include/pcl/surface/grid_projection.h b/surface/include/pcl/surface/grid_projection.h index f3c686960d6..b1d23b11fed 100644 --- a/surface/include/pcl/surface/grid_projection.h +++ b/surface/include/pcl/surface/grid_projection.h @@ -95,7 +95,7 @@ namespace pcl Eigen::Vector3f vect_at_grid_pt; }; - typedef std::unordered_map, std::equal_to, Eigen::aligned_allocator>> HashMap; + typedef std::unordered_map, std::equal_to<>, Eigen::aligned_allocator>> HashMap; /** \brief Constructor. */ GridProjection ();