From 41f95d8562bb1f37fc04672bc077be32c2dce493 Mon Sep 17 00:00:00 2001 From: Hewill Kang Date: Tue, 10 Dec 2024 20:16:29 +0800 Subject: [PATCH 1/2] : Fix formatting Ranges for ADL-only begin/end --- stl/inc/format | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stl/inc/format b/stl/inc/format index 3e11d596dc5..2b7aa8cee3b 100644 --- a/stl/inc/format +++ b/stl/inc/format @@ -3267,8 +3267,11 @@ void _Range_formatter_format_as_sequence(const formatter<_Ty, _CharT>& _Underlyi const basic_string_view<_CharT> _Separator, const basic_string_view<_CharT> _Opening_bracket, const basic_string_view<_CharT> _Closing_bracket, _Range&& _Rng, _FormatContext& _Ctx) { _Ctx.advance_to(_STD _Fmt_write(_Ctx.out(), _Opening_bracket)); - bool _Separate = false; - for (auto&& _Elem : _Rng) { + bool _Separate = false; + auto _Iter = _RANGES begin(_Rng); + const auto _Sent = _RANGES end(_Rng); + for (; _Iter != _Sent; ++_Iter) { + auto&& _Elem = *_Iter; if (_Separate) { _Ctx.advance_to(_STD _Fmt_write(_Ctx.out(), _Separator)); } From cc223550f98dfa02ab6ae2d5b35666fece12f8f5 Mon Sep 17 00:00:00 2001 From: Hewill Kang Date: Tue, 10 Dec 2024 21:15:54 +0800 Subject: [PATCH 2/2] Update stl/inc/format Co-authored-by: A. Jiang --- stl/inc/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/inc/format b/stl/inc/format index 2b7aa8cee3b..6026f34202d 100644 --- a/stl/inc/format +++ b/stl/inc/format @@ -3271,7 +3271,7 @@ void _Range_formatter_format_as_sequence(const formatter<_Ty, _CharT>& _Underlyi auto _Iter = _RANGES begin(_Rng); const auto _Sent = _RANGES end(_Rng); for (; _Iter != _Sent; ++_Iter) { - auto&& _Elem = *_Iter; + auto&& _Elem = *_Iter; if (_Separate) { _Ctx.advance_to(_STD _Fmt_write(_Ctx.out(), _Separator)); }