mirror of
https://github.com/ziglang/zig.git
synced 2026-01-21 06:45:24 +00:00
libcxx: backport llvm/llvm-project#158347
https://github.com/llvm/llvm-project/pull/158347
This commit is contained in:
parent
2357ae06dd
commit
751375f3ca
@ -410,8 +410,13 @@ struct __segmented_iterator_traits<_JoinViewIterator> {
|
||||
|
||||
static constexpr _LIBCPP_HIDE_FROM_ABI _JoinViewIterator
|
||||
__compose(__segment_iterator __seg_iter, __local_iterator __local_iter) {
|
||||
return _JoinViewIterator(
|
||||
std::move(__seg_iter).__get_data(), std::move(__seg_iter).__get_iter(), std::move(__local_iter));
|
||||
auto&& __parent = std::move(__seg_iter).__get_data();
|
||||
auto&& __outer = std::move(__seg_iter).__get_iter();
|
||||
if (__local_iter == ranges::end(*__outer)) {
|
||||
++__outer;
|
||||
return _JoinViewIterator(*__parent, __outer);
|
||||
}
|
||||
return _JoinViewIterator(__parent, __outer, std::move(__local_iter));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user