From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 2AD973857C5E; Fri, 1 Oct 2021 19:39:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2AD973857C5E MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4078] libstdc++: Implement LWG 3529 for std::priority_queue X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e5c093e515c4d1745ea3887da21a49d196475da6 X-Git-Newrev: e79bde6ada42a47b0a266f1cc85efb2eed44e45a Message-Id: <20211001193946.2AD973857C5E@sourceware.org> Date: Fri, 1 Oct 2021 19:39:46 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Oct 2021 19:39:46 -0000 https://gcc.gnu.org/g:e79bde6ada42a47b0a266f1cc85efb2eed44e45a commit r12-4078-ge79bde6ada42a47b0a266f1cc85efb2eed44e45a Author: Jonathan Wakely Date: Thu May 13 14:30:26 2021 +0100 libstdc++: Implement LWG 3529 for std::priority_queue The LWG 3529 issue changes to use two overloads instead of one with a default argument, so that the sequence can be initialized directly with the iterator range when no sequence argument is provided. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/stl_queue.h (priority_queue): Construct sequence from iterators when no sequence argument is present (LWG 3529). * testsuite/23_containers/priority_queue/lwg3529.cc: New test. Diff: --- libstdc++-v3/include/bits/stl_queue.h | 15 +++++++++++---- .../testsuite/23_containers/priority_queue/lwg3529.cc | 13 +++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index 5e7808c0247..f801ebda77f 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -594,13 +594,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION std::make_heap(c.begin(), c.end(), comp); } #else + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3529. priority_queue(first, last) should construct c with (first, last) + template> + priority_queue(_InputIterator __first, _InputIterator __last, + const _Compare& __x = _Compare()) + : c(__first, __last), comp(__x) + { std::make_heap(c.begin(), c.end(), comp); } + // _GLIBCXX_RESOLVE_LIB_DEFECTS // 3522. Missing requirement on InputIterator template parameter template> priority_queue(_InputIterator __first, _InputIterator __last, - const _Compare& __x, - const _Sequence& __s) + const _Compare& __x, const _Sequence& __s) : c(__s), comp(__x) { __glibcxx_requires_valid_range(__first, __last); @@ -611,8 +619,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template> priority_queue(_InputIterator __first, _InputIterator __last, - const _Compare& __x = _Compare(), - _Sequence&& __s = _Sequence()) + const _Compare& __x, _Sequence&& __s) : c(std::move(__s)), comp(__x) { __glibcxx_requires_valid_range(__first, __last); diff --git a/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3529.cc b/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3529.cc new file mode 100644 index 00000000000..014b5aa0f35 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3529.cc @@ -0,0 +1,13 @@ +// { dg-do compile { target c++11 } } + +#include + +struct C : std::vector +{ + C(int*, int*) { } +}; + +int i; + +// LWG 3529. priority_queue(first, last) should construct c with (first, last) +std::priority_queue q(&i, &i);