Make indirect_adapter work with projection-only sorters (issue #138)

Morwenn · Dec 4, 2018 · 37ff05d · 37ff05d
1 parent a1115aa
commit 37ff05d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/include/cpp-sort/adapters/indirect_adapter.h b/include/cpp-sort/adapters/indirect_adapter.h
@@ -34,10 +34,10 @@
 #include <vector>
 #include <cpp-sort/sorter_facade.h>
 #include <cpp-sort/sorter_traits.h>
+#include <cpp-sort/utility/as_function.h>
 #include <cpp-sort/utility/functional.h>
 #include <cpp-sort/utility/iter_move.h>
 #include "../detail/checkers.h"
-#include "../detail/indirect_compare.h"
 #include "../detail/scope_exit.h"
 
 namespace cppsort
@@ -64,6 +64,7 @@ namespace cppsort
                 -> decltype(auto)
             {
                 using utility::iter_move;
+                auto&& proj = utility::as_function(projection);
 
                 ////////////////////////////////////////////////////////////
                 // Indirectly sort the iterators
@@ -77,8 +78,8 @@ namespace cppsort
 
 #ifndef __cpp_lib_uncaught_exceptions
                 // Sort the iterators on pointed values
-                Sorter{}(std::begin(iterators), std::end(iterators),
-                         detail::indirect_compare<Compare, Projection>(compare, projection));
+                Sorter{}(std::begin(iterators), std::end(iterators), std::move(compare),
+                         [&proj](RandomAccessIterator it) -> decltype(auto) { return proj(*it); });
 #else
                 // Work around the sorters that return void
                 auto exit_function = make_scope_success([&] {
@@ -124,8 +125,8 @@ namespace cppsort
                     exit_function.release();
                 }
 
-                return Sorter{}(std::begin(iterators), std::end(iterators),
-                                detail::indirect_compare<Compare, Projection>(compare, projection));
+                return Sorter{}(std::begin(iterators), std::end(iterators), std::move(compare),
+                                [&proj](RandomAccessIterator it) -> decltype(auto) { return proj(*it); });
 #endif
             }
 

diff --git a/testsuite/adapters/indirect_adapter_every_sorter.cpp b/testsuite/adapters/indirect_adapter_every_sorter.cpp
@@ -45,7 +45,9 @@ TEMPLATE_TEST_CASE( "every sorter with indirect adapter", "[indirect_adapter]",
                     cppsort::quick_merge_sorter,
                     cppsort::quick_sorter,
                     cppsort::selection_sorter,
+                    cppsort::ska_sorter,
                     cppsort::smooth_sorter,
+                    cppsort::spread_sorter,
                     cppsort::std_sorter,
                     cppsort::stable_adapter<cppsort::std_sorter>,
                     cppsort::tim_sorter,