[P0843R2] Prepatory work

Author: miscco

stl/inc/algorithm

@@ -1542,7 +1542,7 @@ namespace ranges {
     // clang-format off
     template <input_iterator _It, sentinel_for<_It> _Se, weakly_incrementable _Out>
         requires indirectly_copyable<_It, _Out>
-    _NODISCARD constexpr copy_result<_It, _Out> _Copy_unchecked(_It _First, const _Se _Last, _Out _Result) {
+    constexpr copy_result<_It, _Out> _Copy_unchecked(_It _First, const _Se _Last, _Out _Result) {
         for (; _First != _Last; ++_First, (void) ++_Result) {
             *_Result = *_First;
         }
@@ -1734,6 +1734,17 @@ namespace ranges {
     using move_result = in_out_result<_In, _Out>;
 
     // VARIABLE ranges::move
+    template <input_iterator _It, sentinel_for<_It> _Se, weakly_incrementable _Out>
+    constexpr move_result<_It, _Out> _Move_unchecked(_It _First, const _Se _Last, _Out _Result) {
+        _STL_INTERNAL_STATIC_ASSERT(indirectly_movable<_It, _Out>);
+
+        for (; _First != _Last; ++_First, (void) ++_Result) {
+            *_Result = _RANGES iter_move(_First);
+        }
+
+        return {_STD move(_First), _STD move(_Result)};
+    }
+
     class _Move_fn : private _Not_quite_object {
     public:
         using _Not_quite_object::_Not_quite_object;
@@ -1760,21 +1771,6 @@ namespace ranges {
             return {_STD move(_First), _STD move(_UResult.out)};
         }
         // clang-format on
-
-    private:
-        template <class _It, class _Se, class _Out>
-        _NODISCARD static constexpr move_result<_It, _Out> _Move_unchecked(_It _First, const _Se _Last, _Out _Result) {
-            _STL_INTERNAL_STATIC_ASSERT(input_iterator<_It>);
-            _STL_INTERNAL_STATIC_ASSERT(sentinel_for<_Se, _It>);
-            _STL_INTERNAL_STATIC_ASSERT(weakly_incrementable<_Out>);
-            _STL_INTERNAL_STATIC_ASSERT(indirectly_movable<_It, _Out>);
-
-            for (; _First != _Last; ++_First, (void) ++_Result) {
-                *_Result = _RANGES iter_move(_First);
-            }
-
-            return {_STD move(_First), _STD move(_Result)};
-        }
     };
 
     inline constexpr _Move_fn move{_Not_quite_object::_Construct_tag{}};
@@ -3281,6 +3277,18 @@ namespace ranges {
     using swap_ranges_result = in_in_result<_In1, _In2>;
 
     // VARIABLE ranges::swap_ranges
+    template <input_iterator _It1, sentinel_for<_It1> _Se1, input_iterator _It2, sentinel_for<_It2> _Se2>
+    _NODISCARD constexpr swap_ranges_result<_It1, _It2> _Swap_ranges_unchecked(
+        _It1 _First1, const _Se1 _Last1, _It2 _First2, const _Se2 _Last2) {
+        _STL_INTERNAL_STATIC_ASSERT(indirectly_swappable<_It1, _It2>);
+
+        for (; _First1 != _Last1 && _First2 != _Last2; ++_First1, (void) ++_First2) {
+            _RANGES iter_swap(_First1, _First2);
+        }
+
+        return {_STD move(_First1), _STD move(_First2)};
+    }
+
     class _Swap_ranges_fn : private _Not_quite_object {
     public:
         using _Not_quite_object::_Not_quite_object;
@@ -3317,22 +3325,6 @@ namespace ranges {
             return {_STD move(_First1), _STD move(_First2)};
         }
         // clang-format on
-    private:
-        template <class _It1, class _Se1, class _It2, class _Se2>
-        _NODISCARD static constexpr swap_ranges_result<_It1, _It2> _Swap_ranges_unchecked(
-            _It1 _First1, const _Se1 _Last1, _It2 _First2, const _Se2 _Last2) {
-            _STL_INTERNAL_STATIC_ASSERT(input_iterator<_It1>);
-            _STL_INTERNAL_STATIC_ASSERT(sentinel_for<_Se1, _It1>);
-            _STL_INTERNAL_STATIC_ASSERT(input_iterator<_It2>);
-            _STL_INTERNAL_STATIC_ASSERT(sentinel_for<_Se2, _It2>);
-            _STL_INTERNAL_STATIC_ASSERT(indirectly_swappable<_It1, _It2>);
-
-            for (; _First1 != _Last1 && _First2 != _Last2; ++_First1, (void) ++_First2) {
-                _RANGES iter_swap(_First1, _First2);
-            }
-
-            return {_STD move(_First1), _STD move(_First2)};
-        }
     };
 
     inline constexpr _Swap_ranges_fn swap_ranges{_Not_quite_object::_Construct_tag{}};