From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 8DA473857711; Fri, 11 Aug 2023 14:01:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8DA473857711 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1691762510; bh=F5SnMHhu+lwpsk5jeCX+HcbADTxVGGGIRv1W/lm/tRA=; h=From:To:Subject:Date:From; b=p2yZlQfKN7/40zAnD2OL0d+WcogayQ4JwKQ80JOJPmvJGktMP+k4CCN8U84RQPyXl eVMwQHANNJlHulQXQXFzBmpBLZ1L0GkZ57v6A4gITAkB8ixmcDWSdSG+eV6Spjh5rF ZWQvqIAj1aZRkatlrYoLwS/R6fPlkRGrrbAAIEi8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-3151] libstdc++: Revert accidentally committed change to bits/stl_iterator.h X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 4d9bc81a5d8d884dee7a7781fa4c1577a6c9681a X-Git-Newrev: 7723684fafd085bb567579461fb54a746abbea4f Message-Id: <20230811140150.8DA473857711@sourceware.org> Date: Fri, 11 Aug 2023 14:01:50 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7723684fafd085bb567579461fb54a746abbea4f commit r14-3151-g7723684fafd085bb567579461fb54a746abbea4f Author: Jonathan Wakely Date: Fri Aug 11 14:27:30 2023 +0100 libstdc++: Revert accidentally committed change to bits/stl_iterator.h 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. Diff: --- 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 d5ba05f3e22d..b13f4f8ddbfb 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 }