auto -> std::shared_ptr<queue_impl>

Author: aelovikov-intel

sycl/source/detail/event_impl.cpp

@@ -215,7 +215,7 @@ void event_impl::setQueue(queue_impl &Queue) {
 void event_impl::setSubmittedQueue(std::weak_ptr<queue_impl> SubmittedQueue) {
   MSubmittedQueue = std::move(SubmittedQueue);
   if (MHostProfilingInfo) {
-    if (auto QueuePtr = MSubmittedQueue.lock()) {
+    if (std::shared_ptr<queue_impl> QueuePtr = MSubmittedQueue.lock()) {
       device_impl &Device = QueuePtr->getDeviceImpl();
       MHostProfilingInfo->setDevice(&Device);
     }
@@ -248,7 +248,7 @@ void *event_impl::instrumentationProlog(std::string &Name, int32_t StreamID,
     // queue is available with the wait events. We check to see if the
     // TraceEvent is available in the Queue object.
     void *TraceEvent = nullptr;
-    if (auto Queue = MQueue.lock()) {
+    if (std::shared_ptr<queue_impl> Queue = MQueue.lock()) {
       TraceEvent = Queue->getTraceEvent();
       WaitEvent =
           (TraceEvent ? static_cast<xpti_td *>(TraceEvent) : GSYCLGraphEvent);
@@ -317,7 +317,7 @@ void event_impl::wait_and_throw(
     std::shared_ptr<sycl::detail::event_impl> Self) {
   wait(Self);
 
-  if (auto SubmittedQueue = MSubmittedQueue.lock())
+  if (std::shared_ptr<queue_impl> SubmittedQueue = MSubmittedQueue.lock())
     SubmittedQueue->throw_asynchronous();
 }
 
@@ -462,7 +462,7 @@ event_impl::get_backend_info<info::platform::version>() const {
                           "the info::platform::version info descriptor can "
                           "only be queried with an OpenCL backend");
   }
-  if (auto Queue = MQueue.lock()) {
+  if (std::shared_ptr<queue_impl> Queue = MQueue.lock()) {
     return Queue->getDeviceImpl()
         .get_platform()
         .get_info<info::platform::version>();
@@ -485,7 +485,7 @@ event_impl::get_backend_info<info::device::version>() const {
                           "the info::device::version info descriptor can only "
                           "be queried with an OpenCL backend");
   }
-  if (auto Queue = MQueue.lock()) {
+  if (std::shared_ptr<queue_impl> Queue = MQueue.lock()) {
     return Queue->getDeviceImpl().get_info<info::device::version>();
   }
   return ""; // If the queue has been released, no device will be associated so
@@ -604,7 +604,8 @@ void event_impl::setSubmissionTime() {
   if (!MIsProfilingEnabled && !MProfilingTagEvent)
     return;
 
-  if (auto Queue = isHost() ? MSubmittedQueue.lock() : MQueue.lock()) {
+  if (std::shared_ptr<queue_impl> Queue =
+          isHost() ? MSubmittedQueue.lock() : MQueue.lock()) {
     device_impl &Device = Queue->getDeviceImpl();
     MSubmitTime = getTimestamp(&Device);
   }

sycl/source/detail/graph_impl.cpp

@@ -674,7 +674,7 @@ void graph_impl::removeQueue(sycl::detail::queue_impl &RecordingQueue) {
 bool graph_impl::clearQueues() {
   bool AnyQueuesCleared = false;
   for (auto &Queue : MRecordingQueues) {
-    if (auto ValidQueue = Queue.lock(); ValidQueue) {
+    if (std::shared_ptr<queue_impl> ValidQueue = Queue.lock(); ValidQueue) {
       ValidQueue->setCommandGraph(nullptr);
       AnyQueuesCleared = true;
     }