Revert "include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl_me…

…rge.h - declare local variables outside of the loop in __serial_merge" This reverts commit 9de4d3c.
uxlfoundation · Jan 22, 2025 · 82be174 · 82be174
1 parent d356335
commit 82be174
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl_merge.h b/include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl_merge.h
@@ -148,13 +148,10 @@ __serial_merge(const _Rng1& __rng1, const _Rng2& __rng2, _Rng3& __rng3, const _I
     _Index __rng1_idx = __start1;
     _Index __rng2_idx = __start2;
 
-    bool __rng1_idx_less_n1 = false;
-    bool __rng2_idx_less_n2 = false;
-
     for (_Index __rng3_idx = __start3; __rng3_idx < __rng3_idx_end; ++__rng3_idx)
     {
-        __rng1_idx_less_n1 = __rng1_idx < __rng1_idx_end;
-        __rng2_idx_less_n2 = __rng2_idx < __rng2_idx_end;
+        const bool __rng1_idx_less_n1 = __rng1_idx < __rng1_idx_end;
+        const bool __rng2_idx_less_n2 = __rng2_idx < __rng2_idx_end;
 
         // One of __rng1_idx_less_n1 and __rng2_idx_less_n2 should be true here
         // because 1) we should fill output data with elements from one of the input ranges