Skip to content

Commit 7bc10b9

Browse files
authored
[libc++] Remove a few includes from pair.h (#114708)
1 parent fb30208 commit 7bc10b9

File tree

1 file changed

+1
-4
lines changed
  • libcxx/include/__utility

1 file changed

+1
-4
lines changed

libcxx/include/__utility/pair.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#include <__fwd/array.h>
1818
#include <__fwd/pair.h>
1919
#include <__fwd/tuple.h>
20-
#include <__tuple/sfinae_helpers.h>
21-
#include <__tuple/tuple_element.h>
2220
#include <__tuple/tuple_indices.h>
2321
#include <__tuple/tuple_like_no_subrange.h>
2422
#include <__tuple/tuple_size.h>
@@ -132,8 +130,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
132130
};
133131

134132
template <bool _MaybeEnable>
135-
using _CheckArgsDep _LIBCPP_NODEBUG =
136-
typename conditional< _MaybeEnable, _CheckArgs, __check_tuple_constructor_fail>::type;
133+
using _CheckArgsDep _LIBCPP_NODEBUG = __conditional_t<_MaybeEnable, _CheckArgs, void>;
137134

138135
template <bool _Dummy = true, __enable_if_t<_CheckArgsDep<_Dummy>::__enable_default(), int> = 0>
139136
explicit(!_CheckArgsDep<_Dummy>::__enable_implicit_default()) _LIBCPP_HIDE_FROM_ABI constexpr pair() noexcept(

0 commit comments

Comments
 (0)