Merge pull request #2599 from greenbrettmichael/remove_binary_function

Remove std::binary_function from Registration
PointCloudLibrary · Nov 6, 2018 · 8d7040b · 8d7040b
2 parents 164752b + b04936d
commit 8d7040b
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/registration/include/pcl/registration/correspondence_sorting.h b/registration/include/pcl/registration/correspondence_sorting.h
@@ -54,8 +54,11 @@ namespace pcl
       * \author Dirk Holz
       * \ingroup registration
       */
-    struct sortCorrespondencesByQueryIndex : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
+    struct sortCorrespondencesByQueryIndex
     {
+      typedef pcl::Correspondence first_argument_type;
+      typedef pcl::Correspondence second_argument_type;
+      typedef bool result_type;
       bool
       operator()( pcl::Correspondence a, pcl::Correspondence b)
       {
@@ -67,8 +70,11 @@ namespace pcl
       * \author Dirk Holz
       * \ingroup registration
       */
-    struct sortCorrespondencesByMatchIndex : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
+    struct sortCorrespondencesByMatchIndex
     {
+      typedef pcl::Correspondence first_argument_type;
+      typedef pcl::Correspondence second_argument_type;
+      typedef bool result_type;
       bool 
       operator()( pcl::Correspondence a, pcl::Correspondence b)
       {
@@ -80,8 +86,11 @@ namespace pcl
       * \author Dirk Holz
       * \ingroup registration
       */
-    struct sortCorrespondencesByDistance : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
+    struct sortCorrespondencesByDistance
     {
+      typedef pcl::Correspondence first_argument_type;
+      typedef pcl::Correspondence second_argument_type;
+      typedef bool result_type;
       bool 
       operator()( pcl::Correspondence a, pcl::Correspondence b)
       {
@@ -93,8 +102,11 @@ namespace pcl
       * \author Dirk Holz
       * \ingroup registration
       */
-    struct sortCorrespondencesByQueryIndexAndDistance : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
+    struct sortCorrespondencesByQueryIndexAndDistance
     {
+      typedef pcl::Correspondence first_argument_type;
+      typedef pcl::Correspondence second_argument_type;
+      typedef bool result_type;
       inline bool 
       operator()( pcl::Correspondence a, pcl::Correspondence b)
       {
@@ -110,8 +122,11 @@ namespace pcl
       * \author Dirk Holz
       * \ingroup registration
       */
-    struct sortCorrespondencesByMatchIndexAndDistance : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
+    struct sortCorrespondencesByMatchIndexAndDistance
     {
+      typedef pcl::Correspondence first_argument_type;
+      typedef pcl::Correspondence second_argument_type;
+      typedef bool result_type;
       inline bool 
       operator()( pcl::Correspondence a, pcl::Correspondence b)
       {