From e8aad2195345d7bb2dad2d072cb467845064db35 Mon Sep 17 00:00:00 2001
From: Greg Lueck <gregory.m.lueck@intel.com>
Date: Thu, 24 Oct 2024 11:29:26 -0400
Subject: [PATCH] Undeprecate legacy multi_ptr

Cherry pick #604 from main
(cherry picked from commit f652da8b926a641b4d62056cfc0d60f8cc8769a3)
---
 adoc/chapters/programming_interface.adoc | 5 -----
 adoc/chapters/what_changed.adoc          | 1 -
 adoc/headers/multipointer.h              | 2 +-
 adoc/headers/multipointerlegacy.h        | 2 --
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/adoc/chapters/programming_interface.adoc b/adoc/chapters/programming_interface.adoc
index 401f5ff6..5d41e69f 100644
--- a/adoc/chapters/programming_interface.adoc
+++ b/adoc/chapters/programming_interface.adoc
@@ -9931,7 +9931,6 @@ For interoperability with the <<backend>>, users should rely on types exposed by
 the decorated version.
 If the value of [code]#access::decorated# is [code]#access::decorated::legacy#,
 the 1.2.1 interface is exposed.
-This interface is deprecated.
 
 The template traits [code]#remove_decoration# and type alias
 [code]#remove_decoration_t# retrieve the non-decorated pointer or reference from
@@ -10640,10 +10639,6 @@ below.
 include::{header_dir}/pointer.h[lines=4..-1]
 ----
 
-Note that using [code]#global_ptr#, [code]#local_ptr#, [code]#constant_ptr# or
-[code]#private_ptr# without specifying the decoration is deprecated.
-The default argument is provided for compatibility with 1.2.1.
-
 
 [[subsec:samplers]]
 === Image samplers
diff --git a/adoc/chapters/what_changed.adoc b/adoc/chapters/what_changed.adoc
index 5085b0d3..bb96a207 100644
--- a/adoc/chapters/what_changed.adoc
+++ b/adoc/chapters/what_changed.adoc
@@ -381,7 +381,6 @@ Changes in [code]#multi_ptr# interface:
      Returned pointer and reference are not annotated by an address space;
   ** interface exposing decorated types.
      Returned pointer and reference are annotated by an address space;
-  ** legacy 1.2.1 interface (deprecated).
   * deprecation of the 1.2.1 interface;
   * deprecation of [code]#constant_ptr#;
   * [code]#global_ptr#, [code]#local_ptr# and [code]#private_ptr# alias take the
diff --git a/adoc/headers/multipointer.h b/adoc/headers/multipointer.h
index c9e727b8..32cb6aac 100644
--- a/adoc/headers/multipointer.h
+++ b/adoc/headers/multipointer.h
@@ -15,7 +15,7 @@ enum class address_space : /* unspecified */ {
 enum class decorated : /* unspecified */ {
   no,
   yes,
-  legacy // Deprecated in SYCL 2020
+  legacy
 };
 
 } // namespace access
diff --git a/adoc/headers/multipointerlegacy.h b/adoc/headers/multipointerlegacy.h
index f413cad0..0d510730 100644
--- a/adoc/headers/multipointerlegacy.h
+++ b/adoc/headers/multipointerlegacy.h
@@ -4,7 +4,6 @@
 namespace sycl {
 
 // Legacy interface, inherited from 1.2.1.
-// Deprecated.
 template <typename ElementType, access::address_space Space>
 class [[deprecated]] multi_ptr<ElementType, Space, access::decorated::legacy> {
  public:
@@ -162,7 +161,6 @@ class [[deprecated]] multi_ptr<ElementType, Space, access::decorated::legacy> {
 };
 
 // Legacy interface, inherited from 1.2.1.
-// Deprecated.
 // Specialization of multi_ptr for void and const void
 // VoidType can be either void or const void
 template <access::address_space Space>