libstdc++: Implement LWG 3522 for std::priority_queue

The LWG 3522 issue constrains all constructors of container adaptors
that have InputIterator parameters.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:

	* include/bits/stl_queue.h (priority_queue): Constrain
	constructors with InputIterator parameters (LWG 3522).
	* testsuite/23_containers/priority_queue/lwg3522.cc: New test.

diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h
index 41ffc50d3808761ddef7736a4fd7f4a278003739..5e7808c02475149b27ca290a93211959cf34782a 100644 (file)
--- a/libstdc++-v3/include/bits/stl_queue.h
+++ b/libstdc++-v3/include/bits/stl_queue.h
@@ -594,7 +594,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          std::make_heap(c.begin(), c.end(), comp);
        }
 #else
-      template<typename _InputIterator>
+      // _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)
@@ -605,7 +608,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          std::make_heap(c.begin(), c.end(), comp);
        }
 
-      template<typename _InputIterator>
+      template<typename _InputIterator,
+              typename = std::_RequireInputIter<_InputIterator>>
        priority_queue(_InputIterator __first, _InputIterator __last,
                       const _Compare& __x = _Compare(),
                       _Sequence&& __s = _Sequence())

diff --git a/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3522.cc b/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3522.cc
new file mode 100644 (file)
index 0000000..c026438
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3522.cc
@@ -0,0 +1,24 @@
+// { dg-do compile { target c++11 } }
+
+#include <queue>
+
+// LWG 3522
+// Missing requirement on InputIterator template parameter for priority_queue
+// constructors
+std::priority_queue<int> x = {1, 2}; // { dg-error "could not convert" }
+
+using Q = std::priority_queue<int>;
+using Compare = Q::value_compare;
+using Sequence = Q::container_type;
+
+static_assert( ! std::is_constructible<Q, int, int>(),
+              "priority_queue(InputIterator, InputIterator) is constrained" );
+
+static_assert( ! std::is_constructible<Q, int, int, Compare>(),
+              "priority_queue(InputIterator, InputIterator, const Compare&) "
+              " is constrained" );
+
+static_assert( ! std::is_constructible<Q, int, int, Compare, const Sequence&>(),
+              "and with const Sequence lvalue argument" );
+static_assert( ! std::is_constructible<Q, int, int, Compare, Sequence>(),
+              "and with Sequence rvalue argument" );