From 8ad5361a632f3a6fdcc68f7e7d42974c6ef07e72 Mon Sep 17 00:00:00 2001
From: Sergey Kopienko <>
Date: Tue, 27 Feb 2024 17:47:48 +0100
Subject: [PATCH] include/oneapi/dpl/pstl/hetero/dpcpp/execution_sycl_defs.h -
 change format of the make_device_policy functions to avoid create sycl::queue
 through device_policy::operator sycl::queue()

---
 .../dpl/pstl/hetero/dpcpp/execution_sycl_defs.h       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/oneapi/dpl/pstl/hetero/dpcpp/execution_sycl_defs.h b/include/oneapi/dpl/pstl/hetero/dpcpp/execution_sycl_defs.h
index 66f8ecd948b..d5013ba77af 100644
--- a/include/oneapi/dpl/pstl/hetero/dpcpp/execution_sycl_defs.h
+++ b/include/oneapi/dpl/pstl/hetero/dpcpp/execution_sycl_defs.h
@@ -177,6 +177,13 @@ inline fpga_policy<> dpcpp_fpga{};
 #endif // _ONEDPL_PREDEFINED_POLICIES
 
 // make_policy functions
+template <typename KernelNameOther>
+auto
+make_device_policy(const device_policy<KernelNameOther>& other)
+{
+    return device_policy<DefaultKernelName>(other);
+}
+
 template <typename KernelName = DefaultKernelName>
 device_policy<KernelName>
 make_device_policy(sycl::queue q)
@@ -191,7 +198,7 @@ make_device_policy(sycl::device d)
     return device_policy<KernelName>(d);
 }
 
-template <typename NewKernelName, typename OldKernelName = DefaultKernelName>
+template <typename NewKernelName, typename OldKernelName>
 device_policy<NewKernelName>
 make_device_policy(const device_policy<OldKernelName>& policy
 #if _ONEDPL_PREDEFINED_POLICIES
@@ -202,7 +209,7 @@ make_device_policy(const device_policy<OldKernelName>& policy
     return device_policy<NewKernelName>(policy);
 }
 
-template <typename NewKernelName, typename OldKernelName = DefaultKernelName>
+template <typename NewKernelName, typename OldKernelName>
 device_policy<NewKernelName>
 make_hetero_policy(const device_policy<OldKernelName>& policy)
 {