Adjusted use of wrap/unwrap to templated as per changes in master

Author: oleksandr-pavlyk

libsyclinterface/source/dpctl_sycl_kernel_bundle_interface.cpp

@@ -743,7 +743,7 @@ void DPCTLKernelBundle_Delete(__dpctl_take DPCTLSyclKernelBundleRef KBRef)
 __dpctl_give DPCTLSyclKernelBundleRef
 DPCTLKernelBundle_Copy(__dpctl_keep const DPCTLSyclKernelBundleRef KBRef)
 {
-    auto Bundle = unwrap(KBRef);
+    auto Bundle = unwrap<kernel_bundle<bundle_state::executable>>(KBRef);
     if (!Bundle) {
         error_handler(
             "Cannot copy DPCTLSyclKernelBundleRef as input is a nullptr",
@@ -753,7 +753,7 @@ DPCTLKernelBundle_Copy(__dpctl_keep const DPCTLSyclKernelBundleRef KBRef)
     try {
         auto CopiedBundle =
             new kernel_bundle<bundle_state::executable>(*Bundle);
-        return wrap(CopiedBundle);
+        return wrap<kernel_bundle<bundle_state::executable>>(CopiedBundle);
     } catch (std::exception const &e) {
         error_handler(e, __FILE__, __func__, __LINE__);
         return nullptr;

libsyclinterface/source/dpctl_sycl_kernel_interface.cpp

@@ -62,7 +62,7 @@ DPCTLKernel_GetName(__dpctl_keep const DPCTLSyclKernelRef KRef)
         return nullptr;
     }
 
-    auto sycl_kernel = unwrap(KRef);
+    auto sycl_kernel = unwrap<kernel>(KRef);
     auto name = sycl_kernel->get_info<info::kernel::function_name>();
     return dpctl::helper::cstring_from_string(name);
 }
@@ -75,15 +75,15 @@ void DPCTLKernel_Delete(__dpctl_take DPCTLSyclKernelRef KRef)
 __dpctl_give DPCTLSyclKernelRef
 DPCTLKernel_Copy(__dpctl_keep const DPCTLSyclKernelRef KRef)
 {
-    auto Kernel = unwrap(KRef);
+    auto Kernel = unwrap<kernel>(KRef);
     if (!Kernel) {
         error_handler("Cannot copy DPCTLSyclKernelRef as input is a nullptr",
                       __FILE__, __func__, __LINE__);
         return nullptr;
     }
     try {
         auto CopiedKernel = new kernel(*Kernel);
-        return wrap(CopiedKernel);
+        return wrap<kernel>(CopiedKernel);
     } catch (std::exception const &e) {
         error_handler(e, __FILE__, __func__, __LINE__);
         return nullptr;