public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-3151] libstdc++: Revert accidentally committed change to bits/stl_iterator.h
@ 2023-08-11 14:01 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-08-11 14:01 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:7723684fafd085bb567579461fb54a746abbea4f
commit r14-3151-g7723684fafd085bb567579461fb54a746abbea4f
Author: Jonathan Wakely <jwakely@redhat.com>
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<derived_from<_Cat, _Limit>, _Limit, _Otherwise>;
- template<typename _Iter, typename _Limit>
- using __clamped_iter_cat_t
- = __clamp_iter_cat<__iter_category_t<_Iter>, _Limit>;
-
template<typename _Tp, typename _Up>
concept __different_from
= !same_as<remove_cvref_t<_Tp>, 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<typename __traits_type::iterator_category,
+ random_access_iterator_tag>;
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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-08-11 14:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-11 14:01 [gcc r14-3151] libstdc++: Revert accidentally committed change to bits/stl_iterator.h Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).