Merge branch 'temp_no_handler_scheduler_bypass_test' into temp_no_handler_enable_no_cgh_submit

Author: slawekptak

sycl/source/detail/queue_impl.cpp

@@ -446,7 +446,7 @@ detail::EventImplPtr queue_impl::submit_kernel_direct_impl(
   // No special captures supported yet for the no-handler path
   assert(!KRInfo.DeviceKernelInfoPtr()->HasSpecialCaptures);
 
-  SubmitCommandFuncType SubmitKernelFunc =
+  auto SubmitKernelFunc =
       [&](detail::CG::StorageInitHelper &CGData)
       -> std::pair<EventImplPtr, bool> {
     std::vector<detail::ArgDesc> Args;
@@ -556,6 +556,7 @@ detail::EventImplPtr queue_impl::submit_kernel_direct_impl(
   return submit_direct(CallerNeedsEvent, SubmitKernelFunc);
 }
 
+template <typename SubmitCommandFuncType>
 detail::EventImplPtr
 queue_impl::submit_direct(bool CallerNeedsEvent,
                           SubmitCommandFuncType &SubmitCommandFunc) {

sycl/source/detail/queue_impl.hpp

@@ -951,9 +951,7 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
       bool CallerNeedsEvent, const detail::code_location &CodeLoc,
       bool IsTopCodeLoc);
 
-  using SubmitCommandFuncType = std::function<std::pair<EventImplPtr, bool>(
-      detail::CG::StorageInitHelper &CGData)>;
-
+  template <typename SubmitCommandFuncType>
   detail::EventImplPtr submit_direct(bool CallerNeedsEvent,
                                      SubmitCommandFuncType &SubmitCommandFunc);