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 ESMTPS id A72553858D32 for ; Thu, 10 Aug 2023 22:33:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A72553858D32 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=1691706827; 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; bh=Q7e/7zgklEDsSNGYSHFTMuOZpNxfHSeHWHcjIyGn6Vk=; b=bh4jRhMY5neH6uurF5XzGchxeeQ7xniD/ff5A/qsLvTnPO7+eZQNT63zr24t+OAKCDldN0 j9s+7r2R6KNjSbwrr97S0qOHopwc2ZyZDbM2jVumdP4soeYCkAGvKadoYW0Mph3LAkdDvw 85HLuMlOkqcjDnwZ0xEEYVy9S/uD/PI= 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-338-ZZVRIb84PqGEcaMAzb2QHg-1; Thu, 10 Aug 2023 18:33:45 -0400 X-MC-Unique: ZZVRIb84PqGEcaMAzb2QHg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 853A18015AA; Thu, 10 Aug 2023 22:33:45 +0000 (UTC) Received: from localhost (unknown [10.42.28.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CD322026D4B; Thu, 10 Aug 2023 22:33:45 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Use alias template for iterator_category [PR110970] Date: Thu, 10 Aug 2023 23:32:21 +0100 Message-ID: <20230810223344.1242452-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: Tested x86_64-linux. Pushed to trunk. Backport to gcc-13 to follow. -- >8 -- This renames __iterator_category_t to __iter_category_t, for consistency with std::iter_value_t, std::iter_difference_t and std::iter_reference_t in C++20. Then use __iter_category_t in , which fixes the problem of the missing 'typename' that Clang 15 incorrectly still requires. libstdc++-v3/ChangeLog: PR libstdc++/110970 * include/bits/stl_iterator.h (__detail::__move_iter_cat): Use __iter_category_t. (iterator_traits>::_S_iter_cat): Likewise. (__detail::__basic_const_iterator_iter_cat): Likewise. * include/bits/stl_iterator_base_types.h (__iterator_category_t): Rename to __iter_category_t. --- libstdc++-v3/include/bits/stl_iterator.h | 17 +++++++++-------- .../include/bits/stl_iterator_base_types.h | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index b22d9a4fdb3..d5ba05f3e22 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -103,6 +103,10 @@ _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>>; @@ -168,8 +172,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION random_access_iterator_tag, bidirectional_iterator_tag>; using iterator_category - = __detail::__clamp_iter_cat; + = __detail::__clamped_iter_cat_t<_Iterator, random_access_iterator_tag>; using value_type = iter_value_t<_Iterator>; using difference_type = iter_difference_t<_Iterator>; using reference = iter_reference_t<_Iterator>; @@ -1426,12 +1429,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { }; template - requires requires { typename iterator_traits<_Iterator>::iterator_category; } + requires requires { typename __iter_category_t<_Iterator>; } struct __move_iter_cat<_Iterator> { using iterator_category - = __clamp_iter_cat::iterator_category, - random_access_iterator_tag>; + = __clamped_iter_cat_t<_Iterator, random_access_iterator_tag>; }; #endif } @@ -2288,8 +2290,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static auto _S_iter_cat() { - using _Traits = iterator_traits<_It>; - if constexpr (requires { requires derived_from, forward_iterator_tag>; }) return forward_iterator_tag{}; else @@ -2615,7 +2616,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template struct __basic_const_iterator_iter_cat<_It> - { using iterator_category = iterator_traits<_It>::iterator_category; }; + { using iterator_category = __iter_category_t<_It>; }; } // namespace detail template diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h index 5d2c8b325d9..841b5eca3ad 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_types.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h @@ -243,16 +243,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus >= 201103L template - using __iterator_category_t + using __iter_category_t = typename iterator_traits<_Iter>::iterator_category; template using _RequireInputIter = - __enable_if_t, + __enable_if_t, input_iterator_tag>::value>; template> + typename _Cat = __iter_category_t<_It>> struct __is_random_access_iter : is_base_of { -- 2.41.0