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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id B37AB3857804 for ; Fri, 1 Oct 2021 19:43:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B37AB3857804 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-455-b68ucxuKNMy_Yw9xkZvLzQ-1; Fri, 01 Oct 2021 15:43:37 -0400 X-MC-Unique: b68ucxuKNMy_Yw9xkZvLzQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D13B91808310; Fri, 1 Oct 2021 19:43:36 +0000 (UTC) Received: from localhost (unknown [10.33.36.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83D8D5C1B4; Fri, 1 Oct 2021 19:43:36 +0000 (UTC) Date: Fri, 1 Oct 2021 20:43:35 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Implement LWG 3529 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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="CbJJaSD/bi9emang" 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=unavailable 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:43 -0000 --CbJJaSD/bi9emang Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. Tested powerpc64le-linux. Committed to trunk. --CbJJaSD/bi9emang Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit e79bde6ada42a47b0a266f1cc85efb2eed44e45a Author: Jonathan Wakely 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 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> + 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); --CbJJaSD/bi9emang--