Merge pull request #6294 from mvieth/std_sort

Change sort to std::sort to avoid ambiguity

Author: larshg

keypoints/include/pcl/keypoints/impl/smoothed_surfaces_keypoint.hpp

@@ -230,7 +230,7 @@ pcl::SmoothedSurfacesKeypoint<PointT, PointNT>::initCompute ()
   cloud_normals_.push_back (normals_);
   cloud_trees_.push_back (tree_);
   // Sort the clouds by their scales
-  sort (scales_.begin (), scales_.end (), compareScalesFunction);
+  std::sort (scales_.begin (), scales_.end (), compareScalesFunction);
 
   // Find the index of the input after sorting
   for (std::size_t i = 0; i < scales_.size (); ++i)

registration/include/pcl/registration/impl/ppf_registration.hpp

@@ -250,7 +250,7 @@ pcl::PPFRegistration<PointSource, PointTarget>::clusterPoses(
   PCL_DEBUG("[PPFRegistration] Clustering poses (initially got %zu poses)\n",
             poses.size());
   // Start off by sorting the poses by the number of votes
-  sort(poses.begin(), poses.end(), poseWithVotesCompareFunction);
+  std::sort(poses.begin(), poses.end(), poseWithVotesCompareFunction);
 
   std::vector<PoseWithVotesList> clusters;
   std::vector<std::pair<std::size_t, unsigned int>> cluster_votes;

search/include/pcl/search/impl/search.hpp

@@ -194,7 +194,7 @@ pcl::search::Search<PointT>::sortResults (
     order [idx] = static_cast<index_t> (idx);
 
   Compare compare (distances);
-  sort (order.begin (), order.end (), compare);
+  std::sort (order.begin (), order.end (), compare);
 
   Indices sorted (indices.size ());
   for (std::size_t idx = 0; idx < order.size (); ++idx)
@@ -203,7 +203,7 @@ pcl::search::Search<PointT>::sortResults (
   indices = sorted;
 
   // sort  the according distances.
-  sort (distances.begin (), distances.end ());
+  std::sort (distances.begin (), distances.end ());
 }
 
 #define PCL_INSTANTIATE_Search(T) template class PCL_EXPORTS pcl::search::Search<T>;