[SYCL] Adopt __SYCL_DEPRECATED__ in sub_group.hpp

Signed-off-by: John Pennycook <[email protected]>

Author: Pennycook

sycl/include/CL/sycl/intel/sub_group.hpp

@@ -160,18 +160,16 @@ struct sub_group {
   /* --- vote / ballot functions --- */
 
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::any_of instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::any_of instead.")
 #endif
-  bool
-  any(bool predicate) const {
+  bool any(bool predicate) const {
     return __spirv_GroupAny(__spv::Scope::Subgroup, predicate);
   }
 
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::all_of instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::all_of instead.")
 #endif
-  bool
-  all(bool predicate) const {
+  bool all(bool predicate) const {
     return __spirv_GroupAll(__spv::Scope::Subgroup, predicate);
   }
 
@@ -183,50 +181,46 @@ struct sub_group {
 
   template <typename T>
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::broadcast instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::broadcast instead.")
 #endif
-  EnableIfIsScalarArithmetic<T>
-  broadcast(T x, id<1> local_id) const {
+  EnableIfIsScalarArithmetic<T> broadcast(T x, id<1> local_id) const {
     return detail::spirv::GroupBroadcast<__spv::Scope::Subgroup>(x, local_id);
   }
 
   template <typename T, class BinaryOperation>
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::reduce instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::reduce instead.")
 #endif
-  EnableIfIsScalarArithmetic<T>
-  reduce(T x, BinaryOperation op) const {
+  EnableIfIsScalarArithmetic<T> reduce(T x, BinaryOperation op) const {
     return detail::calc<T, __spv::GroupOperation::Reduce,
                         __spv::Scope::Subgroup>(
         typename detail::GroupOpTag<T>::type(), x, op);
   }
 
   template <typename T, class BinaryOperation>
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::reduce instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::reduce instead.")
 #endif
-  EnableIfIsScalarArithmetic<T>
-  reduce(T x, T init, BinaryOperation op) const {
+  EnableIfIsScalarArithmetic<T> reduce(T x, T init, BinaryOperation op) const {
     return op(init, reduce(x, op));
   }
 
   template <typename T, class BinaryOperation>
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::exclusive_scan instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::exclusive_scan instead.")
 #endif
-  EnableIfIsScalarArithmetic<T>
-  exclusive_scan(T x, BinaryOperation op) const {
+  EnableIfIsScalarArithmetic<T> exclusive_scan(T x, BinaryOperation op) const {
     return detail::calc<T, __spv::GroupOperation::ExclusiveScan,
                         __spv::Scope::Subgroup>(
         typename detail::GroupOpTag<T>::type(), x, op);
   }
 
   template <typename T, class BinaryOperation>
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::exclusive_scan instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::exclusive_scan instead.")
 #endif
-  EnableIfIsScalarArithmetic<T>
-  exclusive_scan(T x, T init, BinaryOperation op) const {
+  EnableIfIsScalarArithmetic<T> exclusive_scan(T x, T init,
+                                               BinaryOperation op) const {
     if (get_local_id().get(0) == 0) {
       x = op(init, x);
     }
@@ -239,21 +233,20 @@ struct sub_group {
 
   template <typename T, class BinaryOperation>
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::inclusive_scan instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::inclusive_scan instead.")
 #endif
-  EnableIfIsScalarArithmetic<T>
-  inclusive_scan(T x, BinaryOperation op) const {
+  EnableIfIsScalarArithmetic<T> inclusive_scan(T x, BinaryOperation op) const {
     return detail::calc<T, __spv::GroupOperation::InclusiveScan,
                         __spv::Scope::Subgroup>(
         typename detail::GroupOpTag<T>::type(), x, op);
   }
 
   template <typename T, class BinaryOperation>
 #if __cplusplus >= 201402L
-  [[deprecated("Use sycl::intel::inclusive_scan instead.")]]
+  __SYCL_DEPRECATED__("Use sycl::intel::inclusive_scan instead.")
 #endif
-  EnableIfIsScalarArithmetic<T>
-  inclusive_scan(T x, BinaryOperation op, T init) const {
+  EnableIfIsScalarArithmetic<T> inclusive_scan(T x, BinaryOperation op,
+                                               T init) const {
     if (get_local_id().get(0) == 0) {
       x = op(init, x);
     }