Skip to content

Commit 41d5b05

Browse files
cpplearnerCaseyCarterStephanTLavavej
authored andcommitted
Remove LWG comments (microsoft#2269)
Co-authored-by: Casey Carter <[email protected]> Co-authored-by: Stephan T. Lavavej <[email protected]>
1 parent 8940468 commit 41d5b05

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

stl/inc/optional

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ _NODISCARD constexpr bool operator>=(const _Ty1& _Left, const optional<_Ty2>& _R
642642
#ifdef __cpp_lib_concepts
643643
// clang-format off
644644
template <class _Ty1, class _Ty2>
645-
requires (!_Is_specialization_v<_Ty2, optional>) // LWG-3566
645+
requires (!_Is_specialization_v<_Ty2, optional>)
646646
&& three_way_comparable_with<_Ty1, _Ty2>
647647
_NODISCARD constexpr compare_three_way_result_t<_Ty1, _Ty2>
648648
operator<=>(const optional<_Ty1>& _Left, const _Ty2& _Right) {

stl/inc/ranges

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ namespace ranges {
13541354
};
13551355

13561356
basic_istream<_Elem, _Traits>* _Stream;
1357-
_Ty _Val = _Ty{}; // Per LWG issue submitted but unnumbered as of 2021-06-15
1357+
_Ty _Val = _Ty{};
13581358

13591359
public:
13601360
constexpr explicit basic_istream_view(basic_istream<_Elem, _Traits>& _Stream_) noexcept(
@@ -2453,7 +2453,6 @@ namespace ranges {
24532453
_Count = (_STD min) (_RANGES distance(_Range), _Count);
24542454
const auto _First = _RANGES begin(_Range);
24552455

2456-
// The following are all per the proposed resolution of LWG-3407
24572456
if constexpr (_Strat == _St::_Reconstruct_span) {
24582457
return span(_First, _First + _Count);
24592458
} else if constexpr (_Strat == _St::_Reconstruct_string_view) {
@@ -2823,7 +2822,6 @@ namespace ranges {
28232822
// it's a "reconstructible range"; return the same kind of range with a restricted extent
28242823
_Count = (_STD min) (_RANGES distance(_Range), _Count);
28252824

2826-
// The following are all per the proposed resolution of LWG-3407
28272825
if constexpr (_Strat == _St::_Reconstruct_span) {
28282826
return span(_Ubegin(_Range) + _Count, _Uend(_Range));
28292827
} else if constexpr (_Strat == _St::_Reconstruct_subrange) {
@@ -2983,7 +2981,7 @@ namespace ranges {
29832981
template <forward_range _Outer, forward_range _Inner>
29842982
struct _Category_base<_Outer, _Inner, true> {
29852983
using iterator_category =
2986-
conditional_t<common_range<_Inner> // per LWG-3535
2984+
conditional_t<common_range<_Inner> //
29872985
&& derived_from<_Iter_cat_t<iterator_t<_Outer>>, bidirectional_iterator_tag> //
29882986
&& derived_from<_Iter_cat_t<iterator_t<_Inner>>, bidirectional_iterator_tag>,
29892987
bidirectional_iterator_tag,
@@ -3010,7 +3008,7 @@ namespace ranges {
30103008
static constexpr bool _Deref_is_glvalue = is_reference_v<_InnerRng<_Const>>;
30113009

30123010
/* [[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
30143012
_Parent_t* _Parent{};
30153013

30163014
constexpr auto&& _Update_inner() {
@@ -3055,7 +3053,6 @@ namespace ranges {
30553053

30563054
public:
30573055
// clang-format off
3058-
// Per LWG issue unnumbered as of 2021-03-16
30593056
using iterator_concept = conditional_t<_Deref_is_glvalue
30603057
&& bidirectional_range<_Base> && bidirectional_range<_InnerRng<_Const>>
30613058
&& common_range<_InnerRng<_Const>>, bidirectional_iterator_tag,

stl/inc/syncstream

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected:
5656
_Swap(_Right);
5757
}
5858

59-
void _Swap(_Basic_syncbuf_impl& _Right) { // see LWG-3498 regarding noexcept
59+
void _Swap(_Basic_syncbuf_impl& _Right) {
6060
_Mysb::swap(_Right);
6161
_STD swap(_Emit_on_sync, _Right._Emit_on_sync);
6262
_STD swap(_Sync_recorded, _Right._Sync_recorded);
@@ -106,7 +106,7 @@ public:
106106
_Tidy();
107107
}
108108

109-
basic_syncbuf& operator=(basic_syncbuf&& _Right) { // see LWG-3498 regarding noexcept
109+
basic_syncbuf& operator=(basic_syncbuf&& _Right) {
110110
emit();
111111

112112
if (this == _STD addressof(_Right)) {
@@ -145,7 +145,7 @@ public:
145145
return *this;
146146
}
147147

148-
void swap(basic_syncbuf& _Right) { // see LWG-3498 regarding noexcept
148+
void swap(basic_syncbuf& _Right) {
149149
if (this != _STD addressof(_Right)) {
150150
_Pocs(_Getal(), _Right._Getal());
151151
_Swap_except_al(_Right);
@@ -252,7 +252,7 @@ private:
252252
}
253253
}
254254

255-
void _Swap_except_al(basic_syncbuf& _Right) { // see LWG-3498 regarding noexcept
255+
void _Swap_except_al(basic_syncbuf& _Right) {
256256
_Mybase::_Swap(_Right);
257257
_STD swap(_Wrapped, _Right._Wrapped);
258258
_STD swap(_Get_mutex(), _Right._Get_mutex());
@@ -306,8 +306,7 @@ private:
306306
};
307307

308308
template <class _Elem, class _Traits, class _Alloc>
309-
void swap(basic_syncbuf<_Elem, _Traits, _Alloc>& _Left,
310-
basic_syncbuf<_Elem, _Traits, _Alloc>& _Right) { // see LWG-3498 regarding noexcept
309+
void swap(basic_syncbuf<_Elem, _Traits, _Alloc>& _Left, basic_syncbuf<_Elem, _Traits, _Alloc>& _Right) { // LWG-3616
311310
_Left.swap(_Right);
312311
}
313312

stl/inc/xstring

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,7 @@ public:
12761276
#if _HAS_CXX23
12771277
// clang-format off
12781278
template <class _Range>
1279-
requires (!same_as<remove_cvref_t<_Range>, basic_string_view> // per LWG-3581
1279+
requires (!same_as<remove_cvref_t<_Range>, basic_string_view>
12801280
&& _RANGES contiguous_range<_Range>
12811281
&& _RANGES sized_range<_Range>
12821282
&& same_as<_RANGES range_value_t<_Range>, _Elem>
@@ -1285,7 +1285,6 @@ public:
12851285
_Rng.operator _STD basic_string_view<_Elem, _Traits>();
12861286
})
12871287
&& (!requires {
1288-
// per editorial or LWG issue not yet filed as of 2021-06-10
12891288
typename remove_reference_t<_Range>::traits_type;
12901289
} || same_as<typename remove_reference_t<_Range>::traits_type, _Traits>))
12911290
constexpr basic_string_view(_Range&& _Rng) noexcept(

stl/inc/xutility

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3862,7 +3862,7 @@ _NODISCARD _CONSTEXPR17 move_iterator<_Iter> operator+(
38623862
#ifdef __cpp_lib_concepts
38633863
// clang-format off
38643864
requires requires {
3865-
{ _Right.base() + _Off } -> same_as<_Iter>; // LWG-3293
3865+
{ _Right.base() + _Off } -> same_as<_Iter>;
38663866
}
38673867
// clang-format on
38683868
#endif // __cpp_lib_concepts

0 commit comments

Comments
 (0)