@@ -235,7 +235,6 @@ template <class... Types>
235235# include < __tuple/tuple_element.h>
236236# include < __tuple/tuple_like.h>
237237# include < __tuple/tuple_size.h>
238- # include < __tuple/tuple_types.h>
239238# include < __type_traits/common_reference.h>
240239# include < __type_traits/common_type.h>
241240# include < __type_traits/conditional.h>
@@ -265,6 +264,7 @@ template <class... Types>
265264# include < __type_traits/remove_cv.h>
266265# include < __type_traits/remove_cvref.h>
267266# include < __type_traits/remove_reference.h>
267+ # include < __type_traits/type_list.h>
268268# include < __type_traits/unwrap_ref.h>
269269# include < __utility/declval.h>
270270# include < __utility/forward.h>
@@ -571,7 +571,7 @@ __memberwise_copy_assign(_Dest& __dest, _Source const& __source, __index_sequenc
571571
572572template <class _Dest , class _Source , class ... _Up, size_t ... _Np>
573573_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void
574- __memberwise_forward_assign (_Dest& __dest, _Source&& __source, __tuple_types <_Up...>, __index_sequence<_Np...>) {
574+ __memberwise_forward_assign (_Dest& __dest, _Source&& __source, __type_list <_Up...>, __index_sequence<_Np...>) {
575575 std::__swallow (((std::get<_Np>(__dest) = std::forward<_Up>(std::get<_Np>(__source))), void (), 0 )...);
576576}
577577
@@ -876,7 +876,7 @@ public:
876876 requires (_And<is_assignable<const _Tp&, _Tp>...>::value)
877877 {
878878 std::__memberwise_forward_assign (
879- *this , std::move (__tuple), __tuple_types <_Tp...>(), __make_index_sequence<sizeof ...(_Tp)>());
879+ *this , std::move (__tuple), __type_list <_Tp...>(), __make_index_sequence<sizeof ...(_Tp)>());
880880 return *this ;
881881 }
882882# endif // _LIBCPP_STD_VER >= 23
@@ -885,7 +885,7 @@ public:
885885 operator =(_If<_And<is_move_assignable<_Tp>...>::value, tuple, __nat>&& __tuple) noexcept (
886886 _And<is_nothrow_move_assignable<_Tp>...>::value) {
887887 std::__memberwise_forward_assign (
888- *this , std::move (__tuple), __tuple_types <_Tp...>(), __make_index_sequence<sizeof ...(_Tp)>());
888+ *this , std::move (__tuple), __type_list <_Tp...>(), __make_index_sequence<sizeof ...(_Tp)>());
889889 return *this ;
890890 }
891891
@@ -905,7 +905,7 @@ public:
905905 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 tuple&
906906 operator =(tuple<_Up...>&& __tuple) noexcept (_And<is_nothrow_assignable<_Tp&, _Up>...>::value) {
907907 std::__memberwise_forward_assign (
908- *this , std::move (__tuple), __tuple_types <_Up...>(), __make_index_sequence<sizeof ...(_Tp)>());
908+ *this , std::move (__tuple), __type_list <_Up...>(), __make_index_sequence<sizeof ...(_Tp)>());
909909 return *this ;
910910 }
911911
@@ -922,7 +922,7 @@ public:
922922 enable_if_t < _And<_BoolConstant<sizeof ...(_Tp) == sizeof ...(_UTypes)>,
923923 is_assignable<const _Tp&, _UTypes>...>::value>* = nullptr >
924924 _LIBCPP_HIDE_FROM_ABI constexpr const tuple& operator =(tuple<_UTypes...>&& __u) const {
925- std::__memberwise_forward_assign (*this , __u, __tuple_types <_UTypes...>(), __make_index_sequence<sizeof ...(_Tp)>());
925+ std::__memberwise_forward_assign (*this , __u, __type_list <_UTypes...>(), __make_index_sequence<sizeof ...(_Tp)>());
926926 return *this ;
927927 }
928928# endif // _LIBCPP_STD_VER >= 23
@@ -1000,7 +1000,7 @@ public:
10001000 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 tuple&
10011001 operator =(array<_Up, _Np>&& __array) noexcept (_And<is_nothrow_assignable<_Tp&, _Up>...>::value) {
10021002 std::__memberwise_forward_assign (
1003- *this , std::move (__array), __tuple_types <_If<true , _Up, _Tp>...>(), __make_index_sequence<sizeof ...(_Tp)>());
1003+ *this , std::move (__array), __type_list <_If<true , _Up, _Tp>...>(), __make_index_sequence<sizeof ...(_Tp)>());
10041004 return *this ;
10051005 }
10061006
0 commit comments