From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Implement LWG 3529 for std::priority_queue
Date: Fri, 1 Oct 2021 20:43:35 +0100 [thread overview]
Message-ID: <YVdk5xVJ9nvlWvih@redhat.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
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 <jwakely@redhat.com>
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.
Tested powerpc64le-linux. Committed to trunk.
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 2927 bytes --]
commit e79bde6ada42a47b0a266f1cc85efb2eed44e45a
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu May 13 14:30:26 2021
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 <jwakely@redhat.com>
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 --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<typename _InputIterator,
+ typename = std::_RequireInputIter<_InputIterator>>
+ 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<typename _InputIterator,
typename = std::_RequireInputIter<_InputIterator>>
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<typename _InputIterator,
typename = std::_RequireInputIter<_InputIterator>>
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 <queue>
+
+struct C : std::vector<int>
+{
+ C(int*, int*) { }
+};
+
+int i;
+
+// LWG 3529. priority_queue(first, last) should construct c with (first, last)
+std::priority_queue<int, C> q(&i, &i);
reply other threads:[~2021-10-01 19:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YVdk5xVJ9nvlWvih@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).