From 9c186493a7cc1c911910b9c37220334f9529912d Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 18 Jan 2022 22:31:49 +0000
Subject: [PATCH] libstdc++: Update documentation for C++17 deprecations

libstdc++-v3/ChangeLog:

	* doc/xml/manual/evolution.xml: Document deprecations.
	* doc/xml/manual/status_cxx2017.xml: Update status.
	* doc/html/*: Regenerate.
---
 libstdc++-v3/doc/html/manual/api.html          | 10 ++++++++++
 libstdc++-v3/doc/html/manual/status.html       |  4 ++--
 libstdc++-v3/doc/xml/manual/evolution.xml      | 14 ++++++++++++++
 libstdc++-v3/doc/xml/manual/status_cxx2017.xml |  3 +--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/doc/html/manual/api.html b/libstdc++-v3/doc/html/manual/api.html
index 1c7fdaa7394..26087775708 100644
--- a/libstdc++-v3/doc/html/manual/api.html
+++ b/libstdc++-v3/doc/html/manual/api.html
@@ -445,6 +445,16 @@ The <code class="function">std::unexpected</code> function and related typedef a
 accessors for the unexpected handler are deprecated for C++11 and later.
 Dynamic exception specifications should be replaced with <code class="code">noexcept</code>.
 </p><p>
+C++98 adaptable function utilities
+(<code class="code">std::bind1st</code>, <code class="code">std::unary_function</code>,
+<code class="code">std::ptr_fun</code>, <code class="code">std::mem_fun_ref</code> etc.)
+were deprecated for C++11.
+<code class="code">std::iterator</code>, <code class="code">std::raw_storage_iterator</code>,
+<code class="code">get_temporary_buffer</code>, and <code class="code">std::not_fun</code>
+were deprecated for C++17.
+</p><p>
+Non-standard <code class="code">std::pair</code> constructors were deprecated.
+</p><p>
 The <code class="literal">bitmap</code>, <code class="literal">mt</code>, and <code class="literal">pool</code>
 options for <code class="option">--enable-libstdcxx-allocator</code> were removed.
 For the <code class="literal">new</code> option, <code class="classname">std::allocator</code>
diff --git a/libstdc++-v3/doc/html/manual/status.html b/libstdc++-v3/doc/html/manual/status.html
index 960497d3f46..9a350d6f8fa 100644
--- a/libstdc++-v3/doc/html/manual/status.html
+++ b/libstdc++-v3/doc/html/manual/status.html
@@ -676,11 +676,11 @@ Feature-testing recommendations for C++</a>.
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4190.htm" target="_top">
 	  N4190
 	</a>
-      </td><td align="center">No (kept for backwards compatibility)</td><td align="left"> </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Deprecating Vestigial Library Parts in C++17 </td><td align="left">
+      </td><td align="center">No (kept for backwards compatibility)</td><td align="left"> </td></tr><tr><td align="left"> Deprecating Vestigial Library Parts in C++17 </td><td align="left">
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0174r2.html" target="_top">
 	P0174R2
 	</a>
-      </td><td align="center"> No  (kept for backwards compatibility)</td><td align="left"> </td></tr><tr><td align="left"> Making <code class="code">std::owner_less</code> more flexible </td><td align="left">
+      </td><td align="center"> 12.1 </td><td align="left"> </td></tr><tr><td align="left"> Making <code class="code">std::owner_less</code> more flexible </td><td align="left">
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0074r0.html" target="_top">
 	P0074R0
 	</a>
diff --git a/libstdc++-v3/doc/xml/manual/evolution.xml b/libstdc++-v3/doc/xml/manual/evolution.xml
index 34e44ee93e4..f5bc6471465 100644
--- a/libstdc++-v3/doc/xml/manual/evolution.xml
+++ b/libstdc++-v3/doc/xml/manual/evolution.xml
@@ -1033,6 +1033,20 @@ accessors for the unexpected handler are deprecated for C++11 and later.
 Dynamic exception specifications should be replaced with <code>noexcept</code>.
 </para>
 
+<para>
+C++98 adaptable function utilities
+(<code>std::bind1st</code>, <code>std::unary_function</code>,
+<code>std::ptr_fun</code>, <code>std::mem_fun_ref</code> etc.)
+were deprecated for C++11.
+<code>std::iterator</code>, <code>std::raw_storage_iterator</code>,
+<code>get_temporary_buffer</code>, and <code>std::not_fun</code>
+were deprecated for C++17.
+</para>
+
+<para>
+Non-standard <code>std::pair</code> constructors were deprecated.
+</para>
+
 <para>
 The <literal>bitmap</literal>, <literal>mt</literal>, and <literal>pool</literal>
 options for <option>--enable-libstdcxx-allocator</option> were removed.
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
index 459bb13a629..3e11861c7bd 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
@@ -265,14 +265,13 @@ Feature-testing recommendations for C++</link>.
     </row>
 
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry> Deprecating Vestigial Library Parts in C++17 </entry>
       <entry>
 	<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0174r2.html">
 	P0174R2
 	</link>
       </entry>
-      <entry align="center"> No  (kept for backwards compatibility)</entry>
+      <entry align="center"> 12.1 </entry>
       <entry/>
     </row>