Fix merge conflict

Author: uditagarwal97

sycl/source/backend.cpp

@@ -33,13 +33,13 @@ namespace detail {
 static const adapter_impl &getAdapter(backend Backend) {
   switch (Backend) {
   case backend::opencl:
-    return *ur::getAdapter<backend::opencl>();
+    return ur::getAdapter<backend::opencl>();
   case backend::ext_oneapi_level_zero:
-    return *ur::getAdapter<backend::ext_oneapi_level_zero>();
+    return ur::getAdapter<backend::ext_oneapi_level_zero>();
   case backend::ext_oneapi_cuda:
-    return *ur::getAdapter<backend::ext_oneapi_cuda>();
+    return ur::getAdapter<backend::ext_oneapi_cuda>();
   case backend::ext_oneapi_hip:
-    return *ur::getAdapter<backend::ext_oneapi_hip>();
+    return ur::getAdapter<backend::ext_oneapi_hip>();
   default:
     throw sycl::exception(
         sycl::make_error_code(sycl::errc::runtime),

sycl/source/context.cpp

@@ -82,7 +82,7 @@ context::context(cl_context ClContext, async_handler AsyncHandler) {
   Adapter.call<detail::UrApiKind::urContextCreateWithNativeHandle>(
       nativeHandle, Adapter.getUrAdapter(), 0, nullptr, nullptr, &hContext);
 
-  impl = detail::context_impl::create(hContext, AsyncHandler, *Adapter);
+  impl = detail::context_impl::create(hContext, AsyncHandler, Adapter);
 }
 
 template <typename Param>

sycl/source/device.cpp

@@ -42,7 +42,7 @@ device::device(cl_device_id DeviceId) {
   Adapter.call<detail::UrApiKind::urDeviceCreateWithNativeHandle>(
       detail::ur::cast<ur_native_handle_t>(DeviceId), Adapter.getUrAdapter(),
       nullptr, &Device);
-  impl = detail::platform_impl::getPlatformFromUrDevice(Device, *Adapter)
+  impl = detail::platform_impl::getPlatformFromUrDevice(Device, Adapter)
              .getOrMakeDeviceImpl(Device)
              .shared_from_this();
   __SYCL_OCL_CALL(clRetainDevice, DeviceId);

sycl/source/platform.cpp

@@ -32,7 +32,7 @@ platform::platform(cl_platform_id PlatformId) {
   Adapter.call<detail::UrApiKind::urPlatformCreateWithNativeHandle>(
       detail::ur::cast<ur_native_handle_t>(PlatformId), Adapter.getUrAdapter(),
       /* pProperties = */ nullptr, &UrPlatform);
-  impl = detail::platform_impl::getOrMakePlatformImpl(UrPlatform, *Adapter)
+  impl = detail::platform_impl::getOrMakePlatformImpl(UrPlatform, Adapter)
              .shared_from_this();
 }