Post-mortem for issue #139

Morwenn · Mar 22, 2021 · 0c07f38 · 0c07f38
1 parent ddcadeb
commit 0c07f38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/cpp-sort/adapters/stable_adapter.h b/include/cpp-sort/adapters/stable_adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020 Morwenn
+ * Copyright (c) 2016-2021 Morwenn
  * SPDX-License-Identifier: MIT
  */
 #ifndef CPPSORT_ADAPTERS_STABLE_ADAPTER_H_
@@ -25,6 +25,7 @@
 #include "../detail/iterator_traits.h"
 #include "../detail/memory.h"
 #include "../detail/sized_iterator.h"
+#include "../detail/type_traits.h"
 
 namespace cppsort
 {
@@ -41,8 +42,12 @@ namespace cppsort
         {
             private:
 
-                using projection_t = decltype(utility::as_function(std::declval<Projection&>()));
-                using compare_t = decltype(utility::as_function(std::declval<Compare&>()));
+                using projection_t = detail::remove_cvref_t<
+                    decltype(utility::as_function(std::declval<Projection>()))
+                >;
+                using compare_t = detail::remove_cvref_t<
+                    decltype(utility::as_function(std::declval<Compare>()))
+                >;
                 std::tuple<compare_t, projection_t> data;
 
             public:

diff --git a/include/cpp-sort/comparators/projection_compare.h b/include/cpp-sort/comparators/projection_compare.h
@@ -22,10 +22,10 @@ namespace cppsort
         private:
 
             using compare_t = detail::remove_cvref_t<
-                decltype(utility::as_function(std::declval<Compare&>()))
+                decltype(utility::as_function(std::declval<Compare>()))
             >;
             using projection_t = detail::remove_cvref_t<
-                decltype(utility::as_function(std::declval<Projection&>()))
+                decltype(utility::as_function(std::declval<Projection>()))
             >;
             std::tuple<compare_t, projection_t> data;