Fix the default template argument for the new value type in replace[_if] (#2605)

Author: akukanov

documentation/release_notes.rst

@@ -15,6 +15,8 @@ Fixed Issues
 ------------
 - Fixed validation of minimal requirements for range-based algorithms. They require clang 16 and newer
   instead of the corresponding libc++ versions.
+- Fixed the default template argument for the new value type in `ranges::replace` and `ranges::replace_if`
+  to not use projections.
 
 New in 2022.11.0
 =======================

include/oneapi/dpl/pstl/glue_algorithm_ranges_impl.h

@@ -1027,19 +1027,17 @@ struct __swap_ranges_fn
 
 inline constexpr __internal::__swap_ranges_fn swap_ranges;
 
-// [alg.replace_if]
+// [alg.replace]
 
 namespace __internal
 {
-
 struct __replace_if_fn
 {
-    template<typename _ExecutionPolicy, std::ranges::random_access_range _R,
-             typename _Proj = std::identity, typename _T = oneapi::dpl::projected_value_t<std::ranges::iterator_t<_R>, _Proj>,
-             std::indirect_unary_predicate<std::projected<std::ranges::iterator_t<_R>, _Proj>> _Pred>
+    template <typename _ExecutionPolicy, std::ranges::random_access_range _R, typename _Proj = std::identity,
+              typename _T = std::ranges::range_value_t<_R>,
+              std::indirect_unary_predicate<std::projected<std::ranges::iterator_t<_R>, _Proj>> _Pred>
     requires oneapi::dpl::is_execution_policy_v<std::remove_cvref_t<_ExecutionPolicy>>
-        && std::indirectly_writable<std::ranges::iterator_t<_R>, const _T&>
-        && std::ranges::sized_range<_R>
+             && std::ranges::sized_range<_R> && std::indirectly_writable<std::ranges::iterator_t<_R>, const _T&>
 
     std::ranges::borrowed_iterator_t<_R>
     operator()(_ExecutionPolicy&& __exec, _R&& __r, _Pred __pred, const _T& __new_value, _Proj __proj = {}) const
@@ -1056,23 +1054,21 @@ struct __replace_if_fn
 
 inline constexpr __internal::__replace_if_fn replace_if;
 
-// [alg.replace]
-
 namespace __internal
 {
-
 struct __replace_fn
 {
-    template<typename _ExecutionPolicy, std::ranges::random_access_range _R, typename _Proj = std::identity,
-             typename _T1 = oneapi::dpl::projected_value_t<std::ranges::iterator_t<_R>, _Proj>, typename _T2 = _T1>
+    template <typename _ExecutionPolicy, std::ranges::random_access_range _R, typename _Proj = std::identity,
+              typename _T1 = oneapi::dpl::projected_value_t<std::ranges::iterator_t<_R>, _Proj>,
+              typename _T2 = std::ranges::range_value_t<_R>>
     requires oneapi::dpl::is_execution_policy_v<std::remove_cvref_t<_ExecutionPolicy>>
-        && std::indirectly_writable<std::ranges::iterator_t<_R>, const _T2&>
-        && std::indirect_binary_predicate<std::ranges::equal_to,
-                                          std::projected<std::ranges::iterator_t<_R>, _Proj>, const _T1*>
-        && std::ranges::sized_range<_R>
+             && std::ranges::sized_range<_R> && std::indirectly_writable<std::ranges::iterator_t<_R>, const _T2&>
+             && std::indirect_binary_predicate<std::ranges::equal_to,
+                                               std::projected<std::ranges::iterator_t<_R>, _Proj>, const _T1*>
 
     std::ranges::borrowed_iterator_t<_R>
-    operator()(_ExecutionPolicy&& __exec, _R&& __r, const _T1& __old_value, const _T2& __new_value, _Proj __proj = {}) const
+    operator()(_ExecutionPolicy&& __exec, _R&& __r, const _T1& __old_value, const _T2& __new_value,
+               _Proj __proj = {}) const
     {
         return oneapi::dpl::ranges::replace_if(
             std::forward<_ExecutionPolicy>(__exec), std::forward<_R>(__r),
@@ -1081,7 +1077,6 @@ struct __replace_fn
             __new_value, __proj);
     }
 }; //__replace_fn
-
 } //__internal
 
 inline constexpr __internal::__replace_fn replace;