Skip to content

Commit 6ef1d07

Browse files
MikeDvorskiyMikeDvorskiy
committed
[oneDPL][ranges][L1] + typo fixes
1 parent 071372d commit 6ef1d07

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

‎include/oneapi/dpl/pstl/algorithm_ranges_impl.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ __pattern_swap(__serial_tag</*IsVector*/ std::false_type>, _ExecutionPolicy&&, _
738738

739739
template <typename _Tag, typename _ExecutionPolicy, typename _R, typename _Comp, typename _Proj>
740740
std::ranges::borrowed_subrange_t<_R>
741-
__pattern_unique(_Tag __tag, _ExecutionPolicy&&, _R&& __r, _Comp __comp, _Proj __proj)
741+
__pattern_unique(_Tag __tag, _ExecutionPolicy&& __exec, _R&& __r, _Comp __comp, _Proj __proj)
742742
{
743743
auto __pred_2 = [__comp, __proj](auto&& __val1, auto&& __val2) { return std::invoke(__comp, std::invoke(__proj,
744744
std::forward<decltype(__val1)>(__val1)), std::invoke(__proj, std::forward<decltype(__val2)>(__val2)));};
@@ -760,7 +760,7 @@ __pattern_unique(__serial_tag</*IsVector*/ std::false_type>, _ExecutionPolicy&&,
760760

761761
template <typename _Tag, typename _ExecutionPolicy, typename _R, typename _OutRange, typename _Comp, typename _Proj>
762762
std::ranges::unique_copy_result<std::ranges::borrowed_iterator_t<_R>, std::ranges::borrowed_iterator_t<_OutRange>>
763-
__pattern_unique_copy(_Tag __tag, _ExecutionPolicy&&, _R&& __r, _OutRange&& __out_r, _Comp __comp, _Proj __proj)
763+
__pattern_unique_copy(_Tag __tag, _ExecutionPolicy&& __exec, _R&& __r, _OutRange&& __out_r, _Comp __comp, _Proj __proj)
764764
{
765765
auto __pred_2 = [__comp, __proj](auto&& __val1, auto&& __val2) { return std::invoke(__comp, std::invoke(__proj,
766766
std::forward<decltype(__val1)>(__val1)), std::invoke(__proj, std::forward<decltype(__val2)>(__val2)));};
@@ -773,8 +773,9 @@ __pattern_unique_copy(_Tag __tag, _ExecutionPolicy&&, _R&& __r, _OutRange&& __ou
773773
}
774774

775775
template <typename _Tag, typename _ExecutionPolicy, typename _R, typename _OutRange, typename _Comp, typename _Proj>
776-
std::ranges::unique_copy_result<std::ranges::_R>, std::ranges::borrowed_iterator_t<_OutRange>>
777-
__pattern_unique_copy(__serial_tag</*IsVector*/ std::false_type>, _ExecutionPolicy&&, _R&& __r, _OutRange&& __out_r, _Comp __comp, _Proj __proj)
776+
std::ranges::unique_copy_result<std::ranges::borrowed_iterator_t<_R>, std::ranges::borrowed_iterator_t<_OutRange>>
777+
__pattern_unique_copy(__serial_tag</*IsVector*/ std::false_type>, _ExecutionPolicy&&, _R&& __r, _OutRange&& __out_r,
778+
_Comp __comp, _Proj __proj)
778779
{
779780
return std::ranges::unique_copy(std::forward<_R>(__r), std::forward<_OutRange>(__out_r), __comp, __proj);
780781
}

‎include/oneapi/dpl/pstl/glue_algorithm_ranges_impl.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,8 @@ inline constexpr __internal::__remove_fn remove;
10581058

10591059
// [alg.unique]
10601060

1061+
namespace __internal
1062+
{
10611063
struct __unique_fn
10621064
{
10631065

@@ -1079,11 +1081,13 @@ struct __unique_fn
10791081

10801082
inline constexpr __internal::__unique_fn unique;
10811083

1084+
namespace __internal
1085+
{
10821086
struct __unique_copy_fn
10831087
{
10841088
template<typename _ExecutionPolicy, std::ranges::random_access_range _InRange,
10851089
std::ranges::random_access_range _OutRange, typename _Proj = std::identity,
1086-
std::indirect_equivalence_relation<std::projected<std::ranges::iterator_t<_R>, _Proj>>
1090+
std::indirect_equivalence_relation<std::projected<std::ranges::iterator_t<_InRange>, _Proj>>
10871091
_Comp = std::ranges::equal_to>
10881092
requires oneapi::dpl::is_execution_policy_v<std::remove_cvref_t<_ExecutionPolicy>>
10891093
&& std::ranges::sized_range<_InRange> && std::ranges::sized_range<_OutRange>
@@ -1106,7 +1110,6 @@ inline constexpr __internal::__unique_copy_fn unique_copy;
11061110

11071111
namespace __internal
11081112
{
1109-
11101113
struct __reverse_fn
11111114
{
11121115
template<typename _ExecutionPolicy, std::ranges::random_access_range _R>
@@ -1132,7 +1135,6 @@ inline constexpr __internal::__reverse_fn reverse;
11321135

11331136
namespace __internal
11341137
{
1135-
11361138
struct __reverse_copy_fn
11371139
{
11381140
template<typename _ExecutionPolicy, std::ranges::random_access_range _InRange,

‎include/oneapi/dpl/pstl/hetero/algorithm_ranges_impl_hetero.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ bool
212212
__pattern_swap(__hetero_tag<_BackendTag> __tag, _ExecutionPolicy&& __exec, _R1&& __r1, _R2&& __r2)
213213
{
214214
return oneapi::dpl::__internal::__ranges::__pattern_swap(__tag, std::forward<_ExecutionPolicy>(__exec),
215-
oneapi::dpl::__ranges::views::all(std::forward<_R1>(__r1)), oneapi::dpl::__ranges::views::all(::std::forward<_R2>(__r2));
215+
oneapi::dpl::__ranges::views::all(std::forward<_R1>(__r1)), oneapi::dpl::__ranges::views::all(::std::forward<_R2>(__r2)));
216216
}
217217
#endif //_ONEDPL_CPP20_RANGES_PRESENT
218218

@@ -790,8 +790,9 @@ __pattern_unique_copy(__hetero_tag<_BackendTag>, _ExecutionPolicy&& __exec, _Ran
790790

791791
#if _ONEDPL_CPP20_RANGES_PRESENT
792792
template <typename _BackendTag, typename _ExecutionPolicy, typename _R, typename _OutRange, typename _Comp, typename _Proj>
793-
std::ranges::unique_copy_result<std::ranges::_R>, std::ranges::borrowed_iterator_t<_OutRange>>
794-
__pattern_unique_copy(__hetero_tag<_BackendTag>, _ExecutionPolicy&&, _R&& __r, _OutRange&& __out_r, _Comp __comp, _Proj __proj)
793+
std::ranges::unique_copy_result<std::ranges::borrowed_iterator_t<_R>, std::ranges::borrowed_iterator_t<_OutRange>>
794+
__pattern_unique_copy(__hetero_tag<_BackendTag> __tag, _ExecutionPolicy&& __exec, _R&& __r, _OutRange&& __out_r,
795+
_Comp __comp, _Proj __proj)
795796
{
796797
oneapi::dpl::__internal::__compare __pred_2{__comp, __proj};
797798

@@ -839,16 +840,16 @@ __pattern_unique(__hetero_tag<_BackendTag> __tag, _ExecutionPolicy&& __exec, _Ra
839840
#if _ONEDPL_CPP20_RANGES_PRESENT
840841
template <typename _BackendTag, typename _ExecutionPolicy, typename _R, typename _Comp, typename _Proj>
841842
std::ranges::borrowed_subrange_t<_R>
842-
__pattern_unique(__hetero_tag<_BackendTag> __tag, _ExecutionPolicy&&, _R&& __r, _Comp __comp, _Proj __proj)
843+
__pattern_unique(__hetero_tag<_BackendTag> __tag, _ExecutionPolicy&& __exec, _R&& __r, _Comp __comp, _Proj __proj)
843844
{
844845
oneapi::dpl::__internal::__compare __pred_2{__comp, __proj};
845846

846-
auto __it = std::ranges::begin(__r);
847-
auto __end = __t + std::ranges::size(__r);
847+
auto __beg = std::ranges::begin(__r);
848+
auto __end = __beg + std::ranges::size(__r);
848849
auto __idx = oneapi::dpl::__internal::__ranges::__pattern_unique(__tag, std::forward<_ExecutionPolicy>(__exec),
849850
oneapi::dpl::__ranges::views::all_read(std::forward<_R>(__r)), __pred_2);
850851

851-
return std::ranges::borrowed_subrange_t<_R>(__it + __idx, __end);
852+
return std::ranges::borrowed_subrange_t<_R>(__beg + __idx, __end);
852853
}
853854
#endif //_ONEDPL_CPP20_RANGES_PRESENT
854855

0 commit comments

Comments
 (0)