WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 63cf21d

Browse files
SergeyKopienkoSergeyKopienko
committed
include/oneapi/dpl/pstl/algorithm_ranges_impl.h - fix compile errors after merge
1 parent 2116f13 commit 63cf21d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ __pattern_set_intersection(__parallel_tag<_IsVector> __tag, _ExecutionPolicy&& _
10331033
__tag, std::forward<_ExecutionPolicy>(__exec), __left_bound_seq_1, __last1, __first2, __last2, __result,
10341034
[](_DifferenceType __n, _DifferenceType __m) { return std::min(__n, __m); },
10351035
[](_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2,
1036-
_RandomAccessIterator2 __last2, _T* __result, _Comp __comp, _Proj1 __proj1, _Proj2 __proj2) {
1036+
_RandomAccessIterator2 __last2, _Tp* __result, _Comp __comp, _Proj1 __proj1, _Proj2 __proj2) {
10371037
return oneapi::dpl::__utils::__set_intersection_construct(
10381038
__first1, __last1, __first2, __last2, __result,
10391039
oneapi::dpl::__internal::__op_uninitialized_copy<_ExecutionPolicy>{},
@@ -1053,7 +1053,7 @@ __pattern_set_intersection(__parallel_tag<_IsVector> __tag, _ExecutionPolicy&& _
10531053
__tag, std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __left_bound_seq_2, __last2, __result,
10541054
[](_DifferenceType __n, _DifferenceType __m) { return std::min(__n, __m); },
10551055
[](_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2,
1056-
_RandomAccessIterator2 __last2, _T* __result, _Comp __comp, _Proj1 __proj1, _Proj2 __proj2) {
1056+
_RandomAccessIterator2 __last2, _Tp* __result, _Comp __comp, _Proj1 __proj1, _Proj2 __proj2) {
10571057
return oneapi::dpl::__utils::__set_intersection_construct(
10581058
__first2, __last2, __first1, __last1, __result,
10591059
oneapi::dpl::__internal::__op_uninitialized_copy<_ExecutionPolicy>{},

0 commit comments

Comments
 (0)