From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 987303857824 for ; Fri, 1 Oct 2021 19:43:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 987303857824 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-188-Fu-OuvEKMHWaVi_S7EPk1w-1; Fri, 01 Oct 2021 15:43:42 -0400 X-MC-Unique: Fu-OuvEKMHWaVi_S7EPk1w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0DCAA8015C7; Fri, 1 Oct 2021 19:43:42 +0000 (UTC) Received: from localhost (unknown [10.33.36.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DBD960C04; Fri, 1 Oct 2021 19:43:41 +0000 (UTC) Date: Fri, 1 Oct 2021 20:43:40 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Implement LWG 3506 for std::priority_queue Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="ichf5FswAzMIolxI" Content-Disposition: inline X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Oct 2021 19:43:46 -0000 --ichf5FswAzMIolxI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The LWG 3506 issue ads allocator-extended versions of the constructors that take iterator arguments. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/stl_queue.h (priority_queue): Add allocator-extended overloads for constructors taking iterator. * testsuite/23_containers/priority_queue/lwg3506.cc: New test. Tested powerpc64le-linux. Committed to trunk. --ichf5FswAzMIolxI Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 6ccffeb56b92041991aba923545532087e1977f5 Author: Jonathan Wakely Date: Thu May 13 14:30:26 2021 libstdc++: Implement LWG 3506 for std::priority_queue The LWG 3506 issue ads allocator-extended versions of the constructors that take iterator arguments. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/stl_queue.h (priority_queue): Add allocator-extended overloads for constructors taking iterator. * testsuite/23_containers/priority_queue/lwg3506.cc: New test. diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index f801ebda77f..4519f9f2fec 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -626,6 +626,49 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION c.insert(c.end(), __first, __last); std::make_heap(c.begin(), c.end(), comp); } + + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3506. Missing allocator-extended constructors for priority_queue + template, + typename _Requires = _Uses<_Alloc>> + priority_queue(_InputIterator __first, _InputIterator __last, + const _Alloc& __alloc) + : c(__first, __last, __alloc), comp() + { std::make_heap(c.begin(), c.end(), comp); } + + template, + typename _Requires = _Uses<_Alloc>> + priority_queue(_InputIterator __first, _InputIterator __last, + const _Compare& __x, const _Alloc& __alloc) + : c(__first, __last, __alloc), comp(__x) + { std::make_heap(c.begin(), c.end(), comp); } + + template, + typename _Requires = _Uses<_Alloc>> + priority_queue(_InputIterator __first, _InputIterator __last, + const _Compare& __x, const _Sequence& __s, + const _Alloc& __alloc) + : c(__s, __alloc), comp(__x) + { + __glibcxx_requires_valid_range(__first, __last); + c.insert(c.end(), __first, __last); + std::make_heap(c.begin(), c.end(), comp); + } + + template> + priority_queue(_InputIterator __first, _InputIterator __last, + const _Compare& __x, _Sequence&& __s, + const _Alloc& __alloc) + : c(std::move(__s), __alloc), comp(__x) + { + __glibcxx_requires_valid_range(__first, __last); + c.insert(c.end(), __first, __last); + std::make_heap(c.begin(), c.end(), comp); + } #endif /** diff --git a/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3506.cc b/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3506.cc new file mode 100644 index 00000000000..c9c803df8d2 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3506.cc @@ -0,0 +1,54 @@ +// { dg-do run { target c++11 } } + +#include +#include +#include + +void +test_lwg3506() +{ + // LWG 3506 Missing allocator-extended constructors for priority_queue + + using Alloc = __gnu_test::uneq_allocator; + + using Container = std::vector; + + struct Queue : std::priority_queue + { + using priority_queue::priority_queue; + + Alloc get_allocator() const { return c.get_allocator(); } + }; + + using Compare = Queue::value_compare; + + const Alloc a1(1), a2(2), a3(3), a4(4); + const int vals[] = { 5, 3, 9, 1, 7 }; + Container cont({ 20, 30, 40 }, Alloc(99)); + + Queue q1(vals, vals+5, a1); + VERIFY( q1.get_allocator() == a1 ); + VERIFY( q1.size() == 5 ); + VERIFY( q1.top() == 9 ); + + Queue q2(vals, vals+5, Compare(), a2); + VERIFY( q2.get_allocator() == a2 ); + VERIFY( q2.size() == 5 ); + VERIFY( q2.top() == 9 ); + + Queue q3(vals, vals+5, Compare(), cont, a3); + VERIFY( q3.get_allocator() == a3 ); + VERIFY( q3.size() == 8 ); + VERIFY( q3.top() == 40 ); + + Queue q4(vals, vals+5, Compare(), std::move(cont), a4); + VERIFY( q4.get_allocator() == a4 ); + VERIFY( q4.size() == 8 ); + VERIFY( q4.top() == 40 ); + VERIFY( cont.empty() ); +} + +int main() +{ + test_lwg3506(); +} --ichf5FswAzMIolxI--