fix

Author: dyniols

sycl/include/sycl/accessor.hpp

@@ -363,9 +363,8 @@ class accessor_common {
       return MAccessor[MIDs];
     }
 
-    template <int CurDims = SubDims>
-    typename std::enable_if_t<CurDims == 1 && IsAccessAtomic, atomic<DataT, AS>>
-    operator[](size_t Index) const {
+    template <int CurDims = SubDims,typename =std::enable_if_t<CurDims == 1 && IsAccessAtomic>>
+    auto operator[](size_t Index) const {
       MIDs[Dims - CurDims] = Index;
       return MAccessor[MIDs];
     }
@@ -1727,39 +1726,34 @@ class __SYCL_EBO __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
     return getQualifiedPtr()[LinearIndex];
   }
 
-  template <int Dims = Dimensions>
-  operator typename std::enable_if_t<Dims == 0 &&
-                                         AccessMode == access::mode::atomic,
-#ifdef __ENABLE_USM_ADDR_SPACE__
-                                     atomic<DataT>
-#else
-                                     atomic<DataT, AS>
-#endif
-                                     >() const {
+  template <int Dims = Dimensions,typename =std::enable_if_t<Dims == 0 && AccessMode == access::mode::atomic>>
+  operator 
+    #ifdef __ENABLE_USM_ADDR_SPACE__
+            atomic<DataT>
+    #else
+            atomic<DataT, AS>
+    #endif
+    () const {
     const size_t LinearIndex = getLinearIndex(id<AdjustedDim>());
-    return atomic<DataT, AS>(multi_ptr<DataT, AS, access::decorated::yes>(
+    return Test(multi_ptr<DataT, AS, access::decorated::yes>(
         getQualifiedPtr() + LinearIndex));
   }
 
-  template <int Dims = Dimensions>
-  typename std::enable_if_t<(Dims > 0) && AccessMode == access::mode::atomic,
-                            atomic<DataT, AS>>
-  operator[](id<Dimensions> Index) const {
+  template <int Dims = Dimensions, typename = std::enable_if_t<(Dims > 0) && AccessMode == access::mode::atomic>>
+  auto operator[](id<Dimensions> Index) const {
     const size_t LinearIndex = getLinearIndex(Index);
     return atomic<DataT, AS>(multi_ptr<DataT, AS, access::decorated::yes>(
         getQualifiedPtr() + LinearIndex));
   }
 
-  template <int Dims = Dimensions>
-  typename std::enable_if_t<Dims == 1 && AccessMode == access::mode::atomic,
-                            atomic<DataT, AS>>
-  operator[](size_t Index) const {
+  template <int Dims = Dimensions, typename = std::enable_if_t<Dims == 1 && AccessMode == access::mode::atomic>>
+  auto operator[](size_t Index) const {
     const size_t LinearIndex = getLinearIndex(id<AdjustedDim>(Index));
     return atomic<DataT, AS>(multi_ptr<DataT, AS, access::decorated::yes>(
         getQualifiedPtr() + LinearIndex));
   }
   template <int Dims = Dimensions, typename = std::enable_if_t<(Dims > 1)>>
-  auto operator[](size_t Index) const {
+  AccessorSubscript<Dims - 1> operator[](size_t Index) const {
     return AccessorSubscript<Dims - 1>(*this, Index);
   }
 
@@ -2345,27 +2339,22 @@ class __SYCL_SPECIAL_CLASS local_accessor_base :
     return getQualifiedPtr()[Index];
   }
 
-  template <int Dims = Dimensions>
-  operator typename std::enable_if_t<
-      Dims == 0 && AccessMode == access::mode::atomic, atomic<DataT, AS>>()
-      const {
+  template <int Dims = Dimensions,typename=std::enable_if_t<
+      Dims == 0 && AccessMode == access::mode::atomic>>
+      operator atomic<DataT, AS>() const {
     return atomic<DataT, AS>(
         multi_ptr<DataT, AS, access::decorated::yes>(getQualifiedPtr()));
   }
 
-  template <int Dims = Dimensions>
-  typename std::enable_if_t<(Dims > 0) && AccessMode == access::mode::atomic,
-                            atomic<DataT, AS>>
-  operator[](id<Dimensions> Index) const {
+  template <int Dims = Dimensions, typename = std::enable_if_t<(Dims > 0) && AccessMode == access::mode::atomic>>
+  auto operator[](id<Dimensions> Index) const {
     const size_t LinearIndex = getLinearIndex(Index);
     return atomic<DataT, AS>(multi_ptr<DataT, AS, access::decorated::yes>(
         getQualifiedPtr() + LinearIndex));
   }
 
-  template <int Dims = Dimensions>
-  typename std::enable_if_t<Dims == 1 && AccessMode == access::mode::atomic,
-                            atomic<DataT, AS>>
-  operator[](size_t Index) const {
+  template <int Dims = Dimensions, typename=std::enable_if_t<Dims == 1 && AccessMode == access::mode::atomic>>
+  auto operator[](size_t Index) const {
     return atomic<DataT, AS>(multi_ptr<DataT, AS, access::decorated::yes>(
         getQualifiedPtr() + Index));
   }

sycl/include/sycl/atomic.hpp

@@ -166,11 +166,10 @@ extern T __spirv_AtomicMax(std::atomic<T> *Ptr, __spv::Scope::Flag,
 
 namespace sycl {
 inline namespace _V1 {
-namespace detail {
 
 template <typename T, access::address_space addressSpace =
                           access::address_space::global_space>
-class atomic {
+class __SYCL2020_DEPRECATED("use sycl::atomic_ref instead") atomic {
   friend class atomic<T, access::address_space::global_space>;
   static_assert(detail::IsValidAtomicType<T>::value,
                 "Invalid SYCL atomic type. Valid types are: int, "
@@ -400,15 +399,6 @@ T atomic_fetch_max(atomic<T, addressSpace> Object, T Operand,
                    memory_order MemoryOrder = memory_order::relaxed) {
   return Object.fetch_max(Operand, MemoryOrder);
 }
-} // namespace detail
-// This alias is a workaround to allow accessor to use the deprecated
-// cl::sycl::atomic class without causing deprecation warnings without the user
-// explicitly using the corresponding accessor APIs.
-template <typename T, access::address_space addressSpace =
-                          access::address_space::global_space>
-using atomic __SYCL2020_DEPRECATED("use sycl::atomic_ref instead") =
-    detail::atomic<T, addressSpace>;
-
 } // namespace _V1
 } // namespace sycl