Skip to content

Commit 941fe25

Browse files
committed
Repait lex-parser issue on GCC 15.1.0
1 parent aafe2b0 commit 941fe25

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

include/bits/stl_iterator.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2150,24 +2150,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
21502150
const counted_iterator<_It2>& __y)
21512151
{ return __y._M_length <=> __x._M_length; }
21522152

2153+
private:
2154+
_It _M_current = _It();
2155+
iter_difference_t<_It> _M_length = 0;
2156+
2157+
template<input_or_output_iterator _It2> friend class counted_iterator;
2158+
21532159
friend constexpr iter_rvalue_reference_t<_It>
2154-
iter_move(const counted_iterator& __i)
2155-
noexcept(noexcept(ranges::iter_move(__i._M_current)))
2160+
iter_move(const counted_iterator& __i) noexcept(noexcept(ranges::iter_move(__i._M_current)))
21562161
requires input_iterator<_It>
21572162
{ return ranges::iter_move(__i._M_current); }
21582163

21592164
template<indirectly_swappable<_It> _It2>
2160-
friend constexpr void
2161-
iter_swap(const counted_iterator& __x,
2162-
const counted_iterator<_It2>& __y)
2163-
noexcept(noexcept(ranges::iter_swap(__x._M_current, __y._M_current)))
2164-
{ ranges::iter_swap(__x._M_current, __y._M_current); }
2165+
friend constexpr void iter_swap(const counted_iterator& __x, const counted_iterator<_It2>& __y) noexcept(noexcept(ranges::iter_swap(__x._M_current, __y._M_current)))
2166+
{ ranges::iter_swap(__x._M_current, __y._M_current); }
21652167

2166-
private:
2167-
template<input_or_output_iterator _It2> friend class counted_iterator;
2168-
2169-
_It _M_current = _It();
2170-
iter_difference_t<_It> _M_length = 0;
21712168
};
21722169

21732170
template<typename _It>

0 commit comments

Comments
 (0)