From 60e06bd7a5df8f762f1cb1b37cafe0b377736365 Mon Sep 17 00:00:00 2001 From: Dan Hoeflinger <109972525+danhoeflinger@users.noreply.github.com> Date: Sat, 1 Feb 2025 20:32:01 -0500 Subject: [PATCH] Bugfix to avoid __out for MSVC (#2034) --- include/oneapi/dpl/pstl/algorithm_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/oneapi/dpl/pstl/algorithm_impl.h b/include/oneapi/dpl/pstl/algorithm_impl.h index 5f0aef1bb32..46100a9e768 100644 --- a/include/oneapi/dpl/pstl/algorithm_impl.h +++ b/include/oneapi/dpl/pstl/algorithm_impl.h @@ -2954,10 +2954,10 @@ __pattern_remove_if(__parallel_tag<_IsVector> __tag, _ExecutionPolicy&& __exec, // the identical elements from the 2nd sequence are merged first. template std::pair<_Iterator1, _Iterator2> -__serial_merge_out_lim(_Iterator1 __x, _Iterator1 __x_e, _Iterator2 __y, _Iterator2 __y_e, _Iterator3 __out, +__serial_merge_out_lim(_Iterator1 __x, _Iterator1 __x_e, _Iterator2 __y, _Iterator2 __y_e, _Iterator3 __out_b, _Iterator3 __out_e, _Comp __comp) { - for (_Iterator3 __k = __out; __k != __out_e; ++__k) + for (_Iterator3 __k = __out_b; __k != __out_e; ++__k) { if (__x == __x_e) {