resolving ambiguity when these iterator types would match

Signed-off-by: Dan Hoeflinger <[email protected]>
oneapi-src · Mar 11, 2024 · 2f24bdf · 2f24bdf
1 parent 720db34
commit 2f24bdf
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/include/oneapi/dpl/pstl/hetero/dpcpp/utils_ranges_sycl.h b/include/oneapi/dpl/pstl/hetero/dpcpp/utils_ranges_sycl.h
@@ -78,7 +78,11 @@ class all_view
     {
         return begin() + size();
     }
-    __return_t& operator[](__diff_type i) const { return begin()[i]; }
+    __return_t&
+    operator[](__diff_type i) const
+    {
+        return begin()[i];
+    }
 
     __diff_type
     size() const
@@ -206,26 +210,19 @@ struct is_passed_directly<Iter, ::std::enable_if_t<Iter::is_passed_directly::val
 {
 };
 
-//support std::vector::iterator with usm shared allocator as passed directly
-template <class Iter>
-struct is_passed_directly<
-    Iter,
-    ::std::enable_if_t<::std::is_same_v<
-        Iter, typename ::std::vector<typename ::std::iterator_traits<Iter>::value_type,
-                                     typename sycl::usm_allocator<typename ::std::iterator_traits<Iter>::value_type,
-                                                                  sycl::usm::alloc::shared>>::iterator>>>
-    : ::std::true_type
-{
-};
-
-//support std::vector::iterator with usm host allocator as passed directly
+//support std::vector::iterator with usm host / shared allocator as passed directly
 template <class Iter>
 struct is_passed_directly<
     Iter,
-    ::std::enable_if_t<::std::is_same_v<
-        Iter, typename ::std::vector<typename ::std::iterator_traits<Iter>::value_type,
-                                     typename sycl::usm_allocator<typename ::std::iterator_traits<Iter>::value_type,
-                                                                  sycl::usm::alloc::host>>::iterator>>>
+    ::std::enable_if_t<
+        ::std::is_same_v<
+            Iter, typename ::std::vector<typename ::std::iterator_traits<Iter>::value_type,
+                                         typename sycl::usm_allocator<typename ::std::iterator_traits<Iter>::value_type,
+                                                                      sycl::usm::alloc::shared>>::iterator> ||
+        ::std::is_same_v<
+            Iter, typename ::std::vector<typename ::std::iterator_traits<Iter>::value_type,
+                                         typename sycl::usm_allocator<typename ::std::iterator_traits<Iter>::value_type,
+                                                                      sycl::usm::alloc::host>>::iterator>>>
     : ::std::true_type
 {
 };