Skip to content

Commit dd32d6c

Browse files
committed
Cleanup
1 parent ab710f4 commit dd32d6c

File tree

2 files changed

+2
-42
lines changed

2 files changed

+2
-42
lines changed

libcxx/include/tuple

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ template <class... Types>
229229
# include <__tuple/sfinae_helpers.h>
230230
# include <__tuple/tuple_element.h>
231231
# include <__tuple/tuple_indices.h>
232-
// # include <__tuple/tuple_like.h>
233232
# include <__tuple/tuple_like_ext.h>
234233
# include <__tuple/tuple_size.h>
235234
# include <__tuple/tuple_types.h>
@@ -1175,22 +1174,6 @@ operator==(const tuple<_Tp...>& __x, const tuple<_Up...>& __y) {
11751174
return __tuple_equal<sizeof...(_Tp)>()(__x, __y);
11761175
}
11771176

1178-
// # if _LIBCPP_STD_VER >= 23
1179-
// template <class... _Tp, __tuple_like _UTuple>
1180-
// # if _LIBCPP_STD_VER >= 26
1181-
// requires((requires(const _Tp& __t, const _UTuple& __u) {
1182-
// { __t == __u } -> __boolean_testable;
1183-
// } && ...) && (sizeof...(_Tp) == tuple_size_v<_UTuple>))
1184-
// # endif
1185-
// _LIBCPP_HIDE_FROM_ABI constexpr bool
1186-
// operator==(const tuple<_Tp...>& __t, const _UTuple& __u) {
1187-
// # if _LIBCPP_STD_VER < 26
1188-
// static_assert(sizeof...(_Tp) == tuple_size_v<_UTuple>, "Can't compare a tuple and a tuple-like of different sizes");
1189-
// # endif
1190-
// return __tuple_equal<sizeof...(_Tp)>()(__t, __u);
1191-
// }
1192-
// # endif
1193-
11941177
# if _LIBCPP_STD_VER >= 20
11951178

11961179
// operator<=>

libcxx/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
// template <class... Types> class tuple;
1212

1313
// template<class... TTypes, class... UTypes>
14-
// constexpr bool operator==(const tuple<TTypes...>&, const tuple<UTypes...>&); // constexpr since C++14
15-
16-
// constexpr bool operator==(const tuple<TTypes...>&, const UTuple&);
17-
// template<class... TTypes, class... UTypes> // Since C++23
14+
// bool
15+
// operator==(const tuple<TTypes...>& t, const tuple<UTypes...>& u);
1816

1917
// UNSUPPORTED: c++03
2018

@@ -29,8 +27,6 @@
2927

3028
// Test SFINAE.
3129

32-
// ==(const tuple<>&, const tuple<>&);
33-
3430
static_assert(std::equality_comparable<std::tuple<EqualityComparable>>);
3531
static_assert(std::equality_comparable<std::tuple<EqualityComparable, EqualityComparable>>);
3632

@@ -43,29 +39,10 @@ static_assert(!std::equality_comparable_with<std::tuple<NonComparable>, std::tup
4339
static_assert(!std::equality_comparable_with<std::tuple<EqualityComparable>, std::tuple<EqualityComparable, EqualityComparable>>);
4440
static_assert(!std::equality_comparable_with<std::tuple<EqualityComparable, EqualityComparable>, std::tuple<EqualityComparable>>);
4541

46-
// ==(const tuple<>&, const tuple-like&);
47-
48-
// static_assert(std::equality_comparable_with<std::tuple<EqualityComparable, EqualityComparable>, std::pair<EqualityComparable, EqualityComparable>>);
49-
// static_assert(std::equality_comparable_with<std::tuple<EqualityComparable, EqualityComparable>, std::array<EqualityComparable, 2>>);
50-
51-
// static_assert(!std::equality_comparable_with<std::tuple<EqualityComparable, NonComparable>, std::pair<EqualityComparable, NonComparable>>);
52-
// static_assert(!std::equality_comparable_with<std::tuple<EqualityComparable, NonComparable>, std::array<EqualityComparable, 2>>);
53-
// // Size mismatch.
54-
// static_assert(!std::equality_comparable_with<std::tuple<EqualityComparable>, std::pair<EqualityComparable, EqualityComparable>>);
55-
// static_assert(!std::equality_comparable_with<std::tuple<EqualityComparable, EqualityComparable>, std::array<EqualityComparable, 94>>);
56-
5742
#endif
5843

5944
int main(int, char**)
6045
{
61-
// {
62-
// using T1 = std::tuple<int>;
63-
// using T2 = std::array<int, 1>;
64-
// const T1 t1(1);
65-
// const T2 t2{1};
66-
// assert(t1 == t2);
67-
// assert(!(t1 != t2));
68-
// }
6946
{
7047
typedef std::tuple<> T1;
7148
typedef std::tuple<> T2;

0 commit comments

Comments
 (0)