Skip to content

Commit f05b937

Browse files
committed
Fix reviewer comments
1 parent e813bed commit f05b937

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

libcxx/docs/Status/Cxx23Issues.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"`LWG3593 <https://wg21.link/LWG3593>`__","Several iterators' ``base() const &`` and ``lazy_split_view::outer-iterator::value_type::end()`` missing ``noexcept``","2021-10 (Virtual)","","",""
138138
"`LWG3595 <https://wg21.link/LWG3595>`__","Exposition-only classes proxy and postfix-proxy for ``common_iterator`` should be fully ``constexpr``","2021-10 (Virtual)","|Complete|","14",""
139139
"","","","","",""
140-
"`LWG3088 <https://wg21.link/LWG3088>`__","``forward_list::merge`` behaviour unclear when passed ``*this``","2022-02 (Virtual)","|Complete|","21",""
140+
"`LWG3088 <https://wg21.link/LWG3088>`__","``forward_list::merge`` behaviour unclear when passed ``*this``","2022-02 (Virtual)","|Complete|","Yes",""
141141
"`LWG3471 <https://wg21.link/LWG3471>`__","``polymorphic_allocator::allocate`` does not satisfy ``Cpp17Allocator`` requirements","2022-02 (Virtual)","","",""
142142
"`LWG3525 <https://wg21.link/LWG3525>`__","``uses_allocator_construction_args`` fails to handle types convertible to ``pair``","2022-02 (Virtual)","","",""
143143
"`LWG3598 <https://wg21.link/LWG3598>`__","``system_category().default_error_condition(0)`` is underspecified","2022-02 (Virtual)","","",""

libcxx/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_lvalue.pass.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// <forward_list>
1010

1111
// void merge(forward_list& x);
12-
// If (addressof(x) == this) does nothing; otherwise ...
1312

1413
#include <forward_list>
1514
#include <iterator>
@@ -112,9 +111,9 @@ int main(int, char**) {
112111

113112
{ // Make sure self-merging does nothing.
114113
int a[] = {1, 2, 3, 4, 5};
115-
std::forward_list<int> c(a, a + sizeof(a) / sizeof(a[0]));
114+
std::forward_list<int> c(std::begin(a), std::end(a));
116115
c.merge(c);
117-
assert((c == std::forward_list<int>(a, a + sizeof(a) / sizeof(a[0]))));
116+
assert(c == std::forward_list<int>(std::begin(a), std::end(a)));
118117
}
119118

120119
return 0;

libcxx/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_lvalue_pred.pass.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// <forward_list>
1010

1111
// template <class Compare> void merge(forward_list& x, Compare comp);
12-
// If (addressof(x) == this) does nothing; otherwise ...
1312

1413
#include <forward_list>
1514
#include <iterator>
@@ -92,6 +91,7 @@ int main(int, char**) {
9291
C c3(std::begin(t3), std::end(t3));
9392
assert(c1 == c3);
9493
}
94+
9595
#if TEST_STD_VER >= 11
9696
{ // Test with a different allocator.
9797
typedef int T;
@@ -112,9 +112,9 @@ int main(int, char**) {
112112

113113
{ // Make sure self-merging does nothing.
114114
int a[] = {5, 4, 3, 2, 1};
115-
std::forward_list<int> c(a, a + sizeof(a) / sizeof(a[0]));
115+
std::forward_list<int> c(std::begin(a), std::end(a));
116116
c.merge(c, std::greater<int>());
117-
assert((c == std::forward_list<int>(a, a + sizeof(a) / sizeof(a[0]))));
117+
assert(c == std::forward_list<int>(std::begin(a), std::end(a)));
118118
}
119119

120120
return 0;

libcxx/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_rvalue.pass.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// <forward_list>
1212

1313
// void merge(forward_list&& x);
14-
// If (addressof(x) == this) does nothing; otherwise ...
1514

1615
#include <forward_list>
1716
#include <functional>
@@ -105,9 +104,9 @@ int main(int, char**) {
105104

106105
{ // Make sure self-merging does nothing.
107106
int a[] = {1, 2, 3, 4, 5};
108-
std::forward_list<int> c(a, a + sizeof(a) / sizeof(a[0]));
107+
std::forward_list<int> c(std::begin(a), std::end(a));
109108
c.merge(std::move(c));
110-
assert((c == std::forward_list<int>(a, a + sizeof(a) / sizeof(a[0]))));
109+
assert(c == std::forward_list<int>(std::begin(a), std::end(a)));
111110
}
112111

113112
return 0;

libcxx/test/std/containers/sequences/forwardlist/forwardlist.ops/merge_rvalue_pred.pass.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// <forward_list>
1212

1313
// template <class Compare> void merge(forward_list&& x, Compare comp);
14-
// If (addressof(x) == this) does nothing; otherwise ...
1514

1615
#include <forward_list>
1716
#include <functional>
@@ -106,9 +105,9 @@ int main(int, char**) {
106105

107106
{ // Make sure self-merging does nothing.
108107
int a[] = {5, 4, 3, 2, 1};
109-
std::forward_list<int> c(a, a + sizeof(a) / sizeof(a[0]));
108+
std::forward_list<int> c(std::begin(a), std::end(a));
110109
c.merge(std::move(c), std::greater<int>());
111-
assert((c == std::forward_list<int>(a, a + sizeof(a) / sizeof(a[0]))));
110+
assert(c == std::forward_list<int>(std::begin(a), std::end(a)));
112111
}
113112

114113
return 0;

0 commit comments

Comments
 (0)