Fix conflict from rebase

Author: fabiomestre

source/adapters/level_zero/command_buffer.cpp

@@ -1254,7 +1254,8 @@ namespace {
  * @param[out] ZeCommandQueue The L0 command queue.
  * @return UR_RESULT_SUCCESS or an error code on failure
  */
-ur_result_t getZeCommandQueue(ur_queue_handle_t Queue, bool UseCopyEngine,
+ur_result_t getZeCommandQueue(ur_queue_handle_legacy_t Queue,
+                              bool UseCopyEngine,
                               ze_command_queue_handle_t &ZeCommandQueue) {
   auto &QGroup = Queue->getQueueGroup(UseCopyEngine);
   uint32_t QueueGroupOrdinal;
@@ -1271,7 +1272,7 @@ ur_result_t getZeCommandQueue(ur_queue_handle_t Queue, bool UseCopyEngine,
  * @return UR_RESULT_SUCCESS or an error code on failure
  */
 ur_result_t waitForDependencies(ur_exp_command_buffer_handle_t CommandBuffer,
-                                ur_queue_handle_t Queue,
+                                ur_queue_handle_legacy_t Queue,
                                 uint32_t NumEventsInWaitList,
                                 const ur_event_handle_t *EventWaitList) {
   const bool UseCopyEngine = false;
@@ -1322,7 +1323,7 @@ ur_result_t waitForDependencies(ur_exp_command_buffer_handle_t CommandBuffer,
  * @return UR_RESULT_SUCCESS or an error code on failure
  */
 ur_result_t createUserEvent(ur_exp_command_buffer_handle_t CommandBuffer,
-                            ur_queue_handle_t Queue,
+                            ur_queue_handle_legacy_t Queue,
                             ur_command_list_ptr_t SignalCommandList,
                             ur_event_handle_t &Event) {
   // Execution event for this enqueue of the UR command-buffer