Separate sort and stable_sort backends

alugowski · Dec 14, 2023 · f88bcdf · f88bcdf
1 parent cddf3a9
commit f88bcdf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/include/poolstl/algorithm b/include/poolstl/algorithm
@@ -221,7 +221,8 @@ namespace std {
             return;
         }
 
-        poolstl::internal::parallel_sort(std::forward<ExecPolicy>(policy), first, last, comp, false);
+        poolstl::internal::parallel_sort(std::forward<ExecPolicy>(policy), first, last, comp,
+                                         std::sort<RandIt, Compare>);
     }
 
     /**
@@ -247,7 +248,8 @@ namespace std {
             return;
         }
 
-        poolstl::internal::parallel_sort(std::forward<ExecPolicy>(policy), first, last, comp, true);
+        poolstl::internal::parallel_sort(std::forward<ExecPolicy>(policy), first, last, comp,
+                                         std::stable_sort<RandIt, Compare>);
     }
 
     /**

diff --git a/include/poolstl/internal/ttp_impl.hpp b/include/poolstl/internal/ttp_impl.hpp
@@ -158,20 +158,16 @@ namespace poolstl {
          *
          * @param stable Whether to use std::stable_sort or std::sort
          */
-        template <class ExecPolicy, class RandIt, class Compare>
-        void parallel_sort(ExecPolicy &&policy, RandIt first, RandIt last, Compare comp, bool stable) {
+        template <class ExecPolicy, class RandIt, class Compare, class SortFunc>
+        void parallel_sort(ExecPolicy &&policy, RandIt first, RandIt last, Compare comp, SortFunc sortfunc) {
             if (first == last) {
                 return;
             }
 
             // Sort chunks in parallel
             auto futures = parallel_chunk_for_gen(std::forward<ExecPolicy>(policy), first, last,
-                             [&comp, stable] (RandIt chunk_first, RandIt chunk_last) {
-                                 if (stable) {
-                                     std::stable_sort(chunk_first, chunk_last, comp);
-                                 } else {
-                                     std::sort(chunk_first, chunk_last, comp);
-                                 }
+                             [&comp, sortfunc] (RandIt chunk_first, RandIt chunk_last) {
+                                 sortfunc(chunk_first, chunk_last, comp);
                                  return std::make_pair(chunk_first, chunk_last);
                              });