From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 30 Jan 2019 16:23:44 +0000 (+0000)
Subject: * doc/xml/manual/status_cxx2020.xml: Update P0600 entry.
X-Git-Tag: upstream/12.2.0~26464
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7341a03ab85827e2fe36c26e6bfad622bdfd218b;p=platform%2Fupstream%2Fgcc.git

* doc/xml/manual/status_cxx2020.xml: Update P0600 entry.

From-SVN: r268398
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 078a4ae..f30fedf 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-30  Ulrich Drepper  <drepper@redhat.com>
+
+	* doc/xml/manual/status_cxx2020.xml: Update P0600 entry.
+
 2019-01-29  Jonathan Wakely  <jwakely@redhat.com>
 
 	* testsuite/26_numerics/headers/complex/synopsis.cc: Remove incorrect
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2020.xml b/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
index 05d3428..0e56ebc 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
@@ -159,14 +159,13 @@ Feature-testing recommendations for C++</link>.
     </row>
 
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
       <entry>  <code>nodiscard</code> in the Library </entry>
       <entry>
         <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0600r1.pdf">
 	P0600R1
 	</link>
       </entry>
-      <entry align="center"> </entry>
+      <entry align="center"> 9.1 </entry>
       <entry />
     </row>