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 5e7808c02475149b27ca290a93211959cf34782a..f801ebda77f2ccb49874949a9f61185ae545baea 100644 (file)
--- 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 (file)
index 0000000..014b5aa
--- /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);