Skip to content

Update comments for February 2021 LWG issues #1686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephanTLavavej merged 4 commits into from
Apr 5, 2021
Merged

Update comments for February 2021 LWG issues #1686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3997c41
Update comments for February 2021 LWG issues
StephanTLavavej Feb 23, 2021
3bc7b3c
Merge branch 'main' into lwg_comments
StephanTLavavej Mar 23, 2021
e18ecab
Code review feedback.
StephanTLavavej Mar 23, 2021
398376f
Add another WP citation (copied from context).
StephanTLavavej Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stl/inc/iterator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ public:
}

// [counted.iter.access]
_NODISCARD constexpr const _Iter& base() const& noexcept /* strengthened */ { // Per LWG-3391
_NODISCARD constexpr const _Iter& base() const& noexcept /* strengthened */ {
return _Current;
}

Expand Down
4 changes: 2 additions & 2 deletions stl/inc/ranges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2525,7 +2525,8 @@ namespace ranges {

_NODISCARD constexpr auto begin() {
#if _CONTAINER_DEBUG_LEVEL > 0
_STL_VERIFY(_Pred, "LWG-3490 forbids calling begin on a drop_while_view with no predicate");
_STL_VERIFY(
_Pred, "N4885 [range.drop.while.view] forbids calling begin on a drop_while_view with no predicate");
#endif // _CONTAINER_DEBUG_LEVEL > 0
if constexpr (forward_range<_Vw>) {
if (this->_Has_cache()) {
Expand Down Expand Up @@ -3776,7 +3777,6 @@ namespace ranges {
}

constexpr void operator++(int) noexcept(noexcept(++_Current)) /* strengthened */ {
// Constraint removed per LWG-3492
++_Current;
}

Expand Down
2 changes: 1 addition & 1 deletion stl/inc/strstream
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ protected:
const auto _Seeklow = eback();
const auto _Seekdist = _Seekhigh - _Seeklow;

// [depr.strstreambuf.virtuals]/15 effectively says check that the result will be in range
// N4727 [depr.strstreambuf.virtuals]/15 effectively says check that the result will be in range
// [_Seeklow, _Seekhigh]; but we want to calculate this without potential integer overflow
switch (_Way) {
case ios_base::beg:
Expand Down
3 changes: 1 addition & 2 deletions stl/inc/xutility
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3592,7 +3592,6 @@ namespace ranges {
}

constexpr subrange& advance(const iter_difference_t<_It> _Count) {
// Per LWG-3413, this has defined behavior when _Count < 0.
if constexpr (bidirectional_iterator<_It>) {
if (_Count < 0) {
_RANGES advance(_First, _Count);
Expand Down Expand Up @@ -3756,7 +3755,7 @@ public:
// clang-format on

#ifdef __cpp_lib_concepts
_NODISCARD constexpr const iterator_type& base() const& noexcept /* strengthened */ { // Per LWG-3391
_NODISCARD constexpr const iterator_type& base() const& noexcept /* strengthened */ {
return _Current;
}
_NODISCARD constexpr iterator_type base() && noexcept(is_nothrow_move_constructible_v<_Iter>) /* strengthened */ {
Expand Down
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_views_drop_while_death/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void test_view_predicate() {

void test_view_begin() {
DWV r;
(void) r.begin(); // LWG-3490 forbids calling begin on a drop_while_view with no predicate
(void) r.begin(); // N4885 [range.drop.while.view] forbids calling begin on a drop_while_view with no predicate
}

int main(int argc, char* argv[]) {
Expand Down