Skip to content

Commit b98de1a

Browse files
committed
Revert changes for list and forward_list
1 parent 76991ef commit b98de1a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

libcxx/include/forward_list

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ public:
719719
_LIBCPP_HIDE_FROM_ABI forward_list& operator=(forward_list&& __x) noexcept(
720720
(__node_traits::propagate_on_container_move_assignment::value &&
721721
is_nothrow_move_assignable<allocator_type>::value) ||
722-
__node_traits::is_always_equal::value);
722+
allocator_traits<allocator_type>::is_always_equal::value);
723723

724724
_LIBCPP_HIDE_FROM_ABI forward_list& operator=(initializer_list<value_type> __il);
725725

@@ -1013,7 +1013,7 @@ template <class _Tp, class _Alloc>
10131013
inline forward_list<_Tp, _Alloc>& forward_list<_Tp, _Alloc>::operator=(forward_list&& __x) noexcept(
10141014
(__node_traits::propagate_on_container_move_assignment::value &&
10151015
is_nothrow_move_assignable<allocator_type>::value) ||
1016-
__node_traits::is_always_equal::value) {
1016+
allocator_traits<allocator_type>::is_always_equal::value) {
10171017
__move_assign(__x, integral_constant<bool, __node_traits::propagate_on_container_move_assignment::value>());
10181018
return *this;
10191019
}

libcxx/include/list

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ public:
731731
_LIBCPP_HIDE_FROM_ABI list& operator=(list&& __c) noexcept(
732732
(__node_alloc_traits::propagate_on_container_move_assignment::value &&
733733
is_nothrow_move_assignable<__node_allocator>::value) ||
734-
__node_alloc_traits::is_always_equal::value);
734+
allocator_traits<allocator_type>::is_always_equal::value);
735735

736736
_LIBCPP_HIDE_FROM_ABI list& operator=(initializer_list<value_type> __il) {
737737
assign(__il.begin(), __il.end());
@@ -1070,7 +1070,7 @@ template <class _Tp, class _Alloc>
10701070
inline list<_Tp, _Alloc>& list<_Tp, _Alloc>::operator=(list&& __c) noexcept(
10711071
(__node_alloc_traits::propagate_on_container_move_assignment::value &&
10721072
is_nothrow_move_assignable<__node_allocator>::value) ||
1073-
__node_alloc_traits::is_always_equal::value) {
1073+
allocator_traits<allocator_type>::is_always_equal::value) {
10741074
__move_assign(__c, integral_constant<bool, __node_alloc_traits::propagate_on_container_move_assignment::value>());
10751075
return *this;
10761076
}

0 commit comments

Comments
 (0)