From bf5824f9282b88c2f94d76b2999a790252d0df9d Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 3 Jun 2019 14:32:17 +0100
Subject: [PATCH] Corrections for C++2a library status table

	* doc/xml/manual/status_cxx2020.xml: Add missing row for P0920R2.
	Fix bgcolor for P0340R3.
	* doc/html/*: Regenerate.

From-SVN: r271868
---
 libstdc++-v3/ChangeLog                         |  4 ++++
 libstdc++-v3/doc/html/manual/status.html       |  8 ++++++--
 libstdc++-v3/doc/xml/manual/status_cxx2020.xml | 15 +++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c2ae996deee..e1263fd7d25 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2019-06-03  Jonathan Wakely  <jwakely@redhat.com>
 
+	* doc/xml/manual/status_cxx2020.xml: Add missing row for P0920R2.
+	Fix bgcolor for P0340R3.
+	* doc/html/*: Regenerate.
+
 	PR libstdc++/90686
 	* doc/xml/manual/status_cxx2014.xml: Document what's missing from
 	<experimental/memory_resource>.
diff --git a/libstdc++-v3/doc/html/manual/status.html b/libstdc++-v3/doc/html/manual/status.html
index bb3e7362f9b..6e3b48f7ea6 100644
--- a/libstdc++-v3/doc/html/manual/status.html
+++ b/libstdc++-v3/doc/html/manual/status.html
@@ -1366,7 +1366,7 @@ Feature-testing recommendations for C++</a>.
         <a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p0339r6.pdf" target="_top">
         P0339R6
 	</a>
-      </td><td align="center"> 9.1 </td><td align="left"> </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Making std::underlying_type SFINAE-friendly </td><td align="left">
+      </td><td align="center"> 9.1 </td><td align="left"> </td></tr><tr><td align="left"> Making std::underlying_type SFINAE-friendly </td><td align="left">
         <a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p0340r3.html" target="_top">
         P0340R3
 	</a>
@@ -1416,7 +1416,7 @@ Feature-testing recommendations for C++</a>.
         <a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1164r1.pdf" target="_top">
         P1164R1
 	</a>
-      </td><td align="center"> 8.3 </td><td align="left"> </td></tr><tr bgcolor="#C8B0B0"><td align="left">
+      </td><td align="center"> 8.3 </td><td align="left"> Treated as a DR for C++17 </td></tr><tr bgcolor="#C8B0B0"><td align="left">
         Target Vectorization Policies from Parallelism V2 TS to C++20
       </td><td align="left">
         <a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1001r2.html" target="_top">
@@ -1436,6 +1436,10 @@ Feature-testing recommendations for C++</a>.
         <a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1024r3.pdf" target="_top">
         P1024R3
 	</a>
+      </td><td align="center"> </td><td align="left"> </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Precalculated hash values in lookup </td><td align="left">
+        <a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p0920r2.html" target="_top">
+        P0920R2
+	</a>
       </td><td align="center"> </td><td align="left"> </td></tr><tr><td align="left"> Traits for [Un]bounded Arrays </td><td align="left">
         <a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1357r1.pdf" target="_top">
         P1357R1
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2020.xml b/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
index b4f7a7830a2..029c5bc9b8e 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
@@ -967,7 +967,6 @@ Feature-testing recommendations for C++</link>.
     </row>
 
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry> Making std::underlying_type SFINAE-friendly </entry>
       <entry>
         <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p0340r3.html">
@@ -1072,7 +1071,7 @@ Feature-testing recommendations for C++</link>.
 	</link>
       </entry>
       <entry align="center"> 8.3 </entry>
-      <entry />
+      <entry> Treated as a DR for C++17 </entry>
     </row>
 
     <row>
@@ -1127,6 +1126,18 @@ Feature-testing recommendations for C++</link>.
       <entry />
     </row>
 
+    <row>
+      <?dbhtml bgcolor="#C8B0B0" ?>
+      <entry> Precalculated hash values in lookup </entry>
+      <entry>
+        <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p0920r2.html">
+        P0920R2
+	</link>
+      </entry>
+      <entry align="center"> </entry>
+      <entry />
+    </row>
+
     <row>
       <entry> Traits for [Un]bounded Arrays </entry>
       <entry>
-- 
2.30.2