From 16eb07fd34e08a0dcef125470ad860e9021f8155 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 14 Jun 2019 19:11:13 +0100 Subject: [PATCH] Fix incorrect DR numbers in libstdc++ manual Backport from mainline 2019-05-07 Jonathan Wakely * doc/xml/manual/intro.xml: Fix DR 2537 and DR 2566 confusion. From-SVN: r272302 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/doc/xml/manual/intro.xml | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1aba7c8b1f6b..7b46e22eca02 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2019-06-14 Jonathan Wakely + + Backport from mainline + 2019-05-07 Jonathan Wakely + + * doc/xml/manual/intro.xml: Fix DR 2537 and DR 2566 confusion. + 2019-06-14 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/doc/xml/manual/intro.xml b/libstdc++-v3/doc/xml/manual/intro.xml index 9761b82fd655..518981559a01 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. 2537: - Requirements on the first template parameter of container adaptors + Constructors for priority_queue taking allocators + should call make_heap - Add static assertions to enforce the requirement. + Call make_heap. 2566: - Constructors for priority_queue taking allocators - should call make_heap + Requirements on the first template parameter of container adaptors - Call make_heap. + Add static assertions to enforce the requirement. 2583: -- 2.47.2