@@ -1354,7 +1354,7 @@ namespace ranges {
1354
1354
};
1355
1355
1356
1356
basic_istream<_Elem, _Traits>* _Stream;
1357
- _Ty _Val = _Ty{}; // Per LWG issue submitted but unnumbered as of 2021-06-15
1357
+ _Ty _Val = _Ty{};
1358
1358
1359
1359
public:
1360
1360
constexpr explicit basic_istream_view(basic_istream<_Elem, _Traits>& _Stream_) noexcept(
@@ -2453,7 +2453,6 @@ namespace ranges {
2453
2453
_Count = (_STD min) (_RANGES distance(_Range), _Count);
2454
2454
const auto _First = _RANGES begin(_Range);
2455
2455
2456
- // The following are all per the proposed resolution of LWG-3407
2457
2456
if constexpr (_Strat == _St::_Reconstruct_span) {
2458
2457
return span(_First, _First + _Count);
2459
2458
} else if constexpr (_Strat == _St::_Reconstruct_string_view) {
@@ -2823,7 +2822,6 @@ namespace ranges {
2823
2822
// it's a "reconstructible range"; return the same kind of range with a restricted extent
2824
2823
_Count = (_STD min) (_RANGES distance(_Range), _Count);
2825
2824
2826
- // The following are all per the proposed resolution of LWG-3407
2827
2825
if constexpr (_Strat == _St::_Reconstruct_span) {
2828
2826
return span(_Ubegin(_Range) + _Count, _Uend(_Range));
2829
2827
} else if constexpr (_Strat == _St::_Reconstruct_subrange) {
@@ -2983,7 +2981,7 @@ namespace ranges {
2983
2981
template <forward_range _Outer, forward_range _Inner>
2984
2982
struct _Category_base<_Outer, _Inner, true> {
2985
2983
using iterator_category =
2986
- conditional_t<common_range<_Inner> // per LWG-3535
2984
+ conditional_t<common_range<_Inner> //
2987
2985
&& derived_from<_Iter_cat_t<iterator_t<_Outer>>, bidirectional_iterator_tag> //
2988
2986
&& derived_from<_Iter_cat_t<iterator_t<_Inner>>, bidirectional_iterator_tag>,
2989
2987
bidirectional_iterator_tag,
@@ -3010,7 +3008,7 @@ namespace ranges {
3010
3008
static constexpr bool _Deref_is_glvalue = is_reference_v<_InnerRng<_Const>>;
3011
3009
3012
3010
/* [[no_unique_address]] */ _OuterIter _Outer{};
3013
- /* [[no_unique_address]] */ _Defaultabox<_InnerIter> _Inner{}; // per LWG issue unfiled as of 2021-06-14
3011
+ /* [[no_unique_address]] */ _Defaultabox<_InnerIter> _Inner{}; // per LWG-3569
3014
3012
_Parent_t* _Parent{};
3015
3013
3016
3014
constexpr auto&& _Update_inner() {
@@ -3055,7 +3053,6 @@ namespace ranges {
3055
3053
3056
3054
public:
3057
3055
// clang-format off
3058
- // Per LWG issue unnumbered as of 2021-03-16
3059
3056
using iterator_concept = conditional_t<_Deref_is_glvalue
3060
3057
&& bidirectional_range<_Base> && bidirectional_range<_InnerRng<_Const>>
3061
3058
&& common_range<_InnerRng<_Const>>, bidirectional_iterator_tag,
0 commit comments