[SYCL] Use proper deprecation warning type

Signed-off-by: Hu, Peisen <[email protected]>

Author: HPS-1

sycl/include/sycl/handler.hpp

@@ -2314,7 +2314,7 @@ class __SYCL_EXPORT handler {
 
   template <typename KernelName = detail::auto_name, typename KernelType,
             typename PropertiesT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::single_task (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<ext::oneapi::experimental::is_property_list<
@@ -2367,7 +2367,7 @@ class __SYCL_EXPORT handler {
 
   template <typename KernelName = detail::auto_name, typename PropertiesT,
             typename... RestT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::parallel_for (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<(sizeof...(RestT) > 1) &&
@@ -2386,7 +2386,7 @@ class __SYCL_EXPORT handler {
 
   template <typename KernelName = detail::auto_name, typename PropertiesT,
             typename... RestT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::parallel_for (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<(sizeof...(RestT) > 1) &&
@@ -2405,7 +2405,7 @@ class __SYCL_EXPORT handler {
 
   template <typename KernelName = detail::auto_name, typename PropertiesT,
             typename... RestT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::parallel_for (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<(sizeof...(RestT) > 1) &&
@@ -2448,7 +2448,7 @@ class __SYCL_EXPORT handler {
 
   template <typename KernelName = detail::auto_name, int Dims,
             typename PropertiesT, typename... RestT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::parallel_for (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<(sizeof...(RestT) > 1) &&
@@ -2478,7 +2478,7 @@ class __SYCL_EXPORT handler {
 
   template <typename KernelName = detail::auto_name, typename KernelType,
             int Dims, typename PropertiesT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::parallel_for (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   void parallel_for_work_group(range<Dims> NumWorkGroups, PropertiesT Props,
@@ -2490,7 +2490,7 @@ class __SYCL_EXPORT handler {
 
   template <typename KernelName = detail::auto_name, typename KernelType,
             int Dims, typename PropertiesT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::parallel_for (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   void parallel_for_work_group(range<Dims> NumWorkGroups,

sycl/include/sycl/queue.hpp

@@ -2089,7 +2089,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   /// \param CodeLoc contains the code location of user code
   template <typename KernelName = detail::auto_name, typename KernelType,
             typename PropertiesT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::single_task (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<
@@ -2134,7 +2134,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   /// \param CodeLoc contains the code location of user code
   template <typename KernelName = detail::auto_name, typename KernelType,
             typename PropertiesT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::single_task (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<
@@ -2184,7 +2184,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   /// \param CodeLoc contains the code location of user code
   template <typename KernelName = detail::auto_name, typename KernelType,
             typename PropertiesT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::single_task (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<
@@ -2438,7 +2438,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   /// const KernelType &KernelFunc".
   template <typename KernelName = detail::auto_name, int Dims,
             typename PropertiesT, typename... RestT>
-  __SYCL2020_DEPRECATED(
+  __SYCL_DEPRECATED(
       "Use sycl::ext::oneapi::experimental::parallel_for (provided in the "
       "sycl_ext_oneapi_enqueue_functions extension) instead.")
   std::enable_if_t<