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 ESMTPS id 5B1F03858D20 for ; Fri, 11 Aug 2023 14:03:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5B1F03858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691762586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MQ/gDmu08b5hl4QYpNP+dizX0/prsVDQgcxZV/DlqR0=; b=BzWHYSesDFvzXC5cskLiEYmlgWAZIaYIqr4T4aSik/alTznC1l9PTamUIouTFLCkvtxc7t aFS3rWWZKiifAcj0pWv3AEAaL5WdpeIehZGUKlLL54XPfPfspTIVXiF0uaMx37ytt5VV77 CdavxIc1/pxApC+daqq12km+7lNbpyE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-659-H0IfN1fdNZ2Keq5DGFKnqA-1; Fri, 11 Aug 2023 10:03:04 -0400 X-MC-Unique: H0IfN1fdNZ2Keq5DGFKnqA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 570B8101AA5F; Fri, 11 Aug 2023 14:03:04 +0000 (UTC) Received: from localhost (unknown [10.42.28.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F728492C13; Fri, 11 Aug 2023 14:03:04 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Revert accidentally committed change to bits/stl_iterator.h Date: Fri, 11 Aug 2023 15:02:28 +0100 Message-ID: <20230811140303.1390347-1-jwakely@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.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_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: As promised yesterday, this reverts the part of the change I didn't mean to commit. Tested x86_64-linux. Pushed to trunk. -- >8 -- In commit r14-3134-g9cb2a7c8d54b1f I only meant to change some uses of __clamp_iter_cat to use __iter_category_t, I didn't mean to commit the additional change introducing __clamped_iter_cat_t. This reverts that part. libstdc++-v3/ChangeLog: * include/bits/stl_iterator.h (__clamped_iter_cat_t): Remove. --- libstdc++-v3/include/bits/stl_iterator.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index d5ba05f3e22..b13f4f8ddbf 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -103,10 +103,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using __clamp_iter_cat = __conditional_t, _Limit, _Otherwise>; - template - using __clamped_iter_cat_t - = __clamp_iter_cat<__iter_category_t<_Iter>, _Limit>; - template concept __different_from = !same_as, remove_cvref_t<_Up>>; @@ -172,7 +168,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION random_access_iterator_tag, bidirectional_iterator_tag>; using iterator_category - = __detail::__clamped_iter_cat_t<_Iterator, random_access_iterator_tag>; + = __detail::__clamp_iter_cat; using value_type = iter_value_t<_Iterator>; using difference_type = iter_difference_t<_Iterator>; using reference = iter_reference_t<_Iterator>; @@ -1433,7 +1430,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct __move_iter_cat<_Iterator> { using iterator_category - = __clamped_iter_cat_t<_Iterator, random_access_iterator_tag>; + = __clamp_iter_cat<__iter_category_t<_Iterator>, + random_access_iterator_tag>; }; #endif } -- 2.41.0