Post-merge fixes and more cleanup

Author: AlexeySachkov

sycl/include/sycl/detail/backend_traits_level_zero.hpp

@@ -23,7 +23,7 @@
 #include <sycl/ext/oneapi/backend/level_zero_ownership.hpp> // for ownership
 #include <sycl/image.hpp>                                   // for image
 #include <sycl/kernel.hpp>                                  // for kernel
-#include <sycl/kernel_bundle.hpp>
+#include <sycl/kernel_bundle.hpp>                           // for kernel_b...
 #include <sycl/kernel_bundle_enums.hpp>                     // for bundle_s...
 #include <sycl/platform.hpp>                                // for platform
 #include <sycl/property_list.hpp>                           // for property...

sycl/include/sycl/detail/backend_traits_opencl.hpp

@@ -34,6 +34,8 @@ inline namespace _V1 {
 template<bundle_state State>
 class kernel_bundle;
 class queue;
+template <typename T, int Dimensions, typename AllocatorT, typename Enable>
+class buffer;
 
 namespace detail {
 
@@ -56,13 +58,15 @@ template <> struct interop<backend::opencl, platform> {
   using type = cl_platform_id;
 };
 
-template <typename DataT, int Dimensions, typename AllocatorT>
-struct BackendInput<backend::opencl, buffer<DataT, Dimensions, AllocatorT>> {
+template <typename DataT, int Dimensions, typename AllocatorT, typename Enable>
+struct BackendInput<backend::opencl,
+                    buffer<DataT, Dimensions, AllocatorT, Enable>> {
   using type = cl_mem;
 };
 
-template <typename DataT, int Dimensions, typename AllocatorT>
-struct BackendReturn<backend::opencl, buffer<DataT, Dimensions, AllocatorT>> {
+template <typename DataT, int Dimensions, typename AllocatorT, typename Enable>
+struct BackendReturn<backend::opencl,
+                     buffer<DataT, Dimensions, AllocatorT, Enable>> {
   using type = std::vector<cl_mem>;
 };