Skip to content

Commit 861b526

Browse files
committed
[libc++] Fix broken tuple tests
The tests had copy-paste errors which started showing when an unused-variable warning started being emitted after we made the MoveOnly type constexpr (in a4b8ee6).
1 parent 65cd2c7 commit 861b526

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.cnstr/disable_reduced_arity_initialization_extension.pass.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,16 @@ int main(int, char**)
8989
Tup t(E(0), E(1));
9090
static_assert(std::is_constructible<Tup, E, E>::value, "");
9191
static_assert(!test_convertible<Tup, E, E>(), "");
92-
assert(std::get<0>(t) == 0);
93-
assert(std::get<1>(t) == 1);
94-
assert(std::get<2>(t) == MoveOnly());
92+
assert(std::get<0>(t) == E(0));
93+
assert(std::get<1>(t) == E(1));
94+
assert(std::get<2>(t) == E());
9595

9696
Tup t2(E(0));
9797
static_assert(std::is_constructible<Tup, E>::value, "");
9898
static_assert(!test_convertible<Tup, E>(), "");
99-
assert(std::get<0>(t) == 0);
100-
assert(std::get<1>(t) == E());
101-
assert(std::get<2>(t) == E());
99+
assert(std::get<0>(t2) == E(0));
100+
assert(std::get<1>(t2) == E());
101+
assert(std::get<2>(t2) == E());
102102
}
103103
// Check that SFINAE is properly applied with the default reduced arity
104104
// constructor extensions.

libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.cnstr/enable_reduced_arity_initialization_extension.pass.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ int main(int, char**)
9999

100100
Tup t = {E(0), E(1)};
101101
static_assert(test_convertible<Tup, E, E>(), "");
102-
assert(std::get<0>(t) == 0);
103-
assert(std::get<1>(t) == 1);
104-
assert(std::get<2>(t) == MoveOnly());
102+
assert(std::get<0>(t) == E(0));
103+
assert(std::get<1>(t) == E(1));
104+
assert(std::get<2>(t) == E());
105105

106106
Tup t2 = {E(0)};
107107
static_assert(test_convertible<Tup, E>(), "");
108-
assert(std::get<0>(t) == 0);
109-
assert(std::get<1>(t) == E());
110-
assert(std::get<2>(t) == E());
108+
assert(std::get<0>(t2) == E(0));
109+
assert(std::get<1>(t2) == E());
110+
assert(std::get<2>(t2) == E());
111111
}
112112
// Check that SFINAE is properly applied with the default reduced arity
113113
// constructor extensions.

libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ int main(int, char**)
132132

133133
Tup t(E(0), E(1));
134134
static_assert(!test_convertible<Tup, E, E>(), "");
135-
assert(std::get<0>(t) == 0);
136-
assert(std::get<1>(t) == 1);
137-
assert(std::get<2>(t) == MoveOnly());
135+
assert(std::get<0>(t) == E(0));
136+
assert(std::get<1>(t) == E(1));
137+
assert(std::get<2>(t) == E());
138138

139139
Tup t2(E(0));
140140
static_assert(!test_convertible<Tup, E>(), "");
141-
assert(std::get<0>(t) == 0);
142-
assert(std::get<1>(t) == E());
143-
assert(std::get<2>(t) == E());
141+
assert(std::get<0>(t2) == E(0));
142+
assert(std::get<1>(t2) == E());
143+
assert(std::get<2>(t2) == E());
144144
}
145145
#endif
146146
#if TEST_STD_VER > 11

0 commit comments

Comments
 (0)