Skip to content

Commit 9780273

Browse files
committed
++
1 parent 39dbeed commit 9780273

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

include/oneapi/dpl/pstl/algorithm_impl.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -2948,7 +2948,8 @@ __pattern_remove_if(__parallel_tag<_IsVector> __tag, _ExecutionPolicy&& __exec,
29482948
//------------------------------------------------------------------------
29492949
// merge
29502950
//------------------------------------------------------------------------
2951-
2951+
//Serial version of ___merge_path_out_lim merges 1st sequience and 2nd sequience in "revert maner":
2952+
//the identical elements from 2nd sequience are being merged first.
29522953
template <typename _Iterator1, typename _Iterator2, typename _Iterator3, typename _Comp>
29532954
std::pair<_Iterator1, _Iterator2>
29542955
__serial_merge_out_lim(_Iterator1 __x, _Iterator1 __x_e, _Iterator2 __y, _Iterator2 __y_e, _Iterator3 __i,
@@ -3020,10 +3021,7 @@ std::pair<_It1, _It2>
30203021
___merge_path_out_lim(_Tag, _ExecutionPolicy&& __exec, _It1 __it_1, _Index1 __n_1, _It2 __it_2, _Index2 __n_2,
30213022
_OutIt __it_out, _Index3 __n_out, _Comp __comp)
30223023
{
3023-
//___merge_path_out_lim is called with reverse order: (2nd sequience, 1st sequience)
3024-
//__serial_merge_out_lim does merging in direct order: (1st sequience and 2nd sequience).
3025-
// So, the following call passes 1st sequience 2nd sequience in "a revert maner".
3026-
return __serial_merge_out_lim(__it_2, __it_2 + __n_2, __it_1, __it_1 + __n_1, __it_out, __it_out + __n_out, __comp);
3024+
return __serial_merge_out_lim(__it_1, __it_1 + __n_1, __it_2, __it_2 + __n_2, __it_out, __it_out + __n_out, __comp);
30273025
}
30283026

30293027
inline constexpr std::size_t __merge_path_cut_off = 2000;

include/oneapi/dpl/pstl/algorithm_ranges_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ __pattern_merge(_Tag __tag, _ExecutionPolicy&& __exec, _R1&& __r1, _R2&& __r2, _
471471
if (__n_out == 0)
472472
return __return_type{__it_1, __it_2, __it_out};
473473

474-
//Parallel version of ___merge_path_out_lim merges 1st sequience and 2nd sequience in "revert maner":
474+
//Parallel and serial versions of ___merge_path_out_lim merges 1st sequience and 2nd sequience in "revert maner":
475475
//the identical elements from 2nd sequience are being merged first.
476476
//So, the following call passes 1st sequience 2nd sequience in "a revert maner".
477477
std::pair __res = ___merge_path_out_lim(__tag, std::forward<_ExecutionPolicy>(__exec), __it_2, __n_2, __it_1, __n_1,

0 commit comments

Comments
 (0)