Remove deprecated std::binary_function

pezmaster31 · Dec 15, 2023 · 5b3f4cf · 5b3f4cf
1 parent 0ea2660
commit 5b3f4cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/api/algorithms/Sort.h b/src/api/algorithms/Sort.h
@@ -60,9 +60,6 @@ struct API_EXPORT Sort
         return false;  // <-- unreachable
     }
 
-    //! Base class for our sorting function objects
-    typedef std::binary_function<BamAlignment, BamAlignment, bool> AlignmentSortBase;
-
     /*! \struct BamTools::Algorithms::Sort::ByName
         \brief Function object for comparing alignments by name
 
@@ -79,7 +76,7 @@ struct API_EXPORT Sort
             std::sort( a.begin(), a.end(), Sort::ByName(Sort::DescendingOrder) );
         \endcode
     */
-    struct ByName : public AlignmentSortBase
+    struct ByName
     {
 
         // ctor
@@ -120,7 +117,7 @@ struct API_EXPORT Sort
             std::sort( a.begin(), a.end(), Sort::ByPosition(Sort::DescendingOrder) );
         \endcode
     */
-    struct ByPosition : public AlignmentSortBase
+    struct ByPosition
     {
 
         // ctor
@@ -177,7 +174,7 @@ struct API_EXPORT Sort
         \endcode
     */
     template <typename T>
-    struct ByTag : public AlignmentSortBase
+    struct ByTag
     {
 
         // ctor
@@ -227,7 +224,7 @@ struct API_EXPORT Sort
             std::set<BamAlignment, Sort::Unsorted>; // STL set, unsorted (but probably insertion order)
         \endcode
     */
-    struct Unsorted : public AlignmentSortBase
+    struct Unsorted
     {
 
         // comparison function

diff --git a/src/api/internal/bam/BamMultiMerger_p.h b/src/api/internal/bam/BamMultiMerger_p.h
@@ -49,7 +49,7 @@ struct API_NO_EXPORT MergeItem
 };
 
 template <typename Compare>
-struct API_NO_EXPORT MergeItemSorter : public std::binary_function<MergeItem, MergeItem, bool>
+struct API_NO_EXPORT MergeItemSorter
 {
 
 public:
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,7 @@ struct API_NO_EXPORT MergeItem @@
     };
     template <typename Compare>
-    struct API_NO_EXPORT MergeItemSorter : public std::binary_function<MergeItem, MergeItem, bool>
+    struct API_NO_EXPORT MergeItemSorter
     {
     public:
@@ Expand Down @@