aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2019-05-07 16:30:52 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2019-05-07 16:30:52 +0100
commit73e828becf8d33334800c7a8c83b1d7a8967f2a8 (patch)
treeac920e2a124db8e8da2dd9deb0b13422b0929ced
parentf4e678ef74b2726f9c07be2b39712a9ea4eb7119 (diff)
downloadgcc-73e828becf8d33334800c7a8c83b1d7a8967f2a8.zip
gcc-73e828becf8d33334800c7a8c83b1d7a8967f2a8.tar.gz
gcc-73e828becf8d33334800c7a8c83b1d7a8967f2a8.tar.bz2
Fix incorrect DR numbers in libstdc++ manual
* doc/xml/manual/intro.xml: Fix DR 2537 and DR 2566 confusion. From-SVN: r270954
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/doc/xml/manual/intro.xml10
2 files changed, 9 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 47b8b42..e8c625b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-07 Jonathan Wakely <jwakely@redhat.com>
+
+ * doc/xml/manual/intro.xml: Fix DR 2537 and DR 2566 confusion.
+
2019-05-01 Nina Dinka Ranns <dinka.ranns@gmail.com>
Make allocator propagation more consistent for
diff --git a/libstdc++-v3/doc/xml/manual/intro.xml b/libstdc++-v3/doc/xml/manual/intro.xml
index 9761b82..5189815 100644
--- a/libstdc++-v3/doc/xml/manual/intro.xml
+++ b/libstdc++-v3/doc/xml/manual/intro.xml
@@ -1121,18 +1121,18 @@ requirements of the license of GCC.
</para></listitem></varlistentry>
<varlistentry xml:id="manual.bugs.dr2537"><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&DR;#2537">2537</link>:
- <emphasis>Requirements on the first template parameter of container adaptors
+ <emphasis>Constructors for <code>priority_queue</code> taking allocators
+ should call <code>make_heap</code>
</emphasis>
</term>
- <listitem><para>Add static assertions to enforce the requirement.
+ <listitem><para>Call <code>make_heap</code>.
</para></listitem></varlistentry>
<varlistentry xml:id="manual.bugs.dr2566"><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&DR;#2566">2566</link>:
- <emphasis>Constructors for <code>priority_queue</code> taking allocators
- should call <code>make_heap</code>
+ <emphasis>Requirements on the first template parameter of container adaptors
</emphasis>
</term>
- <listitem><para>Call <code>make_heap</code>.
+ <listitem><para>Add static assertions to enforce the requirement.
</para></listitem></varlistentry>
<varlistentry xml:id="manual.bugs.dr2583"><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&DR;#2583">2583</link>: