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.129.124]) by sourceware.org (Postfix) with ESMTP id 630C93857825 for ; Fri, 1 Oct 2021 19:43:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 630C93857825 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-39-TDQ00YJdNFuvRFJitKOxpA-1; Fri, 01 Oct 2021 15:43:30 -0400 X-MC-Unique: TDQ00YJdNFuvRFJitKOxpA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D52C7100CCC3; Fri, 1 Oct 2021 19:43:29 +0000 (UTC) Received: from localhost (unknown [10.33.36.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87BBC100EBBE; Fri, 1 Oct 2021 19:43:29 +0000 (UTC) Date: Fri, 1 Oct 2021 20:43:28 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Implement LWG 3522 for std::priority_queue Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="wVZJ29cnlGCEi780" 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_H4, RCVD_IN_MSPIKE_WL, 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:37 -0000 --wVZJ29cnlGCEi780 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The LWG 3522 issue constrains all constructors of container adaptors that have InputIterator parameters. Signed-off-by: Jonathan Wakely 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. Tested powerpc64le-linux. Committed to trunk. --wVZJ29cnlGCEi780 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit e5c093e515c4d1745ea3887da21a49d196475da6 Author: Jonathan Wakely Date: Thu May 13 14:30:26 2021 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 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 41ffc50d380..5e7808c0247 100644 --- 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 + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3522. Missing requirement on InputIterator template parameter + template> 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 + template> 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 index 00000000000..c026438585b --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/priority_queue/lwg3522.cc @@ -0,0 +1,24 @@ +// { dg-do compile { target c++11 } } + +#include + +// LWG 3522 +// Missing requirement on InputIterator template parameter for priority_queue +// constructors +std::priority_queue x = {1, 2}; // { dg-error "could not convert" } + +using Q = std::priority_queue; +using Compare = Q::value_compare; +using Sequence = Q::container_type; + +static_assert( ! std::is_constructible(), + "priority_queue(InputIterator, InputIterator) is constrained" ); + +static_assert( ! std::is_constructible(), + "priority_queue(InputIterator, InputIterator, const Compare&) " + " is constrained" ); + +static_assert( ! std::is_constructible(), + "and with const Sequence lvalue argument" ); +static_assert( ! std::is_constructible(), + "and with Sequence rvalue argument" ); --wVZJ29cnlGCEi780--