Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADL-proof container operations for iterator pairs and comparators #4258

Merged
merged 8 commits into from
Jan 17, 2024
Merged

ADL-proof container operations for iterator pairs and comparators #4258

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d18fdfd
ADL-proof container operations for iterator pairs and comparators
frederick-vs-ja Dec 13, 2023
9c5cd4d
Consistent `_STD` in `erase`, `replace`, and `replace_with_range`
frederick-vs-ja Dec 13, 2023
1ee08c6
Test coverage
frederick-vs-ja Dec 13, 2023
5f1024d
Unskip one libcxx test
frederick-vs-ja Dec 13, 2023
1d8607e
Missed changes in `_Uninitialized_copy`
frederick-vs-ja Dec 13, 2023
dfe48e5
Merge branch 'microsoft:main' into adl-proof-cont-iter-op
frederick-vs-ja Dec 15, 2023
72cb96a
Merge branch 'main' into adl-proof-cont-iter-op
StephanTLavavej Jan 12, 2024
7d2f8c1
Fix bogus-ish basic_string::replace() call in testing.
StephanTLavavej Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions stl/inc/deque
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,8 @@ public:

template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
void assign(_Iter _First, _Iter _Last) {
_Adl_verify_range(_First, _Last);
_Assign_range(_Get_unwrapped(_First), _Get_unwrapped(_Last));
_STD _Adl_verify_range(_First, _Last);
_Assign_range(_STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
}

#if _HAS_CXX23 && defined(__cpp_lib_concepts) // TRANSITION, GH-395
Expand Down Expand Up @@ -1244,10 +1244,10 @@ public:
template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
iterator insert(const_iterator _Where, _Iter _First, _Iter _Last) {
// insert [_First, _Last) at _Where
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
const size_type _Off = static_cast<size_type>(_Where - begin());
return _Insert_range<static_cast<_Is_bidi>(_Is_cpp17_bidi_iter_v<_Iter>)>(
_Off, _Get_unwrapped(_First), _Get_unwrapped(_Last));
_Off, _STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
}

#if _HAS_CXX23 && defined(__cpp_lib_concepts) // TRANSITION, GH-395
Expand Down Expand Up @@ -1469,7 +1469,7 @@ public:

#if _ITERATOR_DEBUG_LEVEL == 2
_STL_VERIFY(_First <= _Last && begin() <= _First && _Last <= end(), "deque erase iterator outside range");
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);

auto _Off = static_cast<size_type>(_First - begin());
auto _Count = static_cast<size_type>(_Last - _First);
Expand Down
22 changes: 11 additions & 11 deletions stl/inc/forward_list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,18 +595,18 @@ public:

template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
forward_list(_Iter _First, _Iter _Last) : _Mypair(_Zero_then_variadic_args_t{}) {
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
_Flist_insert_after_op2<_Alnode> _Insert_op(_Getal());
_Insert_op._Append_range_unchecked(_Get_unwrapped(_First), _Get_unwrapped(_Last));
_Insert_op._Append_range_unchecked(_STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
_Alloc_proxy();
_Insert_op._Attach_after(_Mypair._Myval2._Before_head());
}

template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
forward_list(_Iter _First, _Iter _Last, const _Alloc& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
_Flist_insert_after_op2<_Alnode> _Insert_op(_Getal());
_Insert_op._Append_range_unchecked(_Get_unwrapped(_First), _Get_unwrapped(_Last));
_Insert_op._Append_range_unchecked(_STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
_Alloc_proxy();
_Insert_op._Attach_after(_Mypair._Myval2._Before_head());
}
Expand Down Expand Up @@ -960,8 +960,8 @@ private:
public:
template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
void assign(_Iter _First, _Iter _Last) {
_Adl_verify_range(_First, _Last);
_Assign_unchecked(_Get_unwrapped(_First), _Get_unwrapped(_Last));
_STD _Adl_verify_range(_First, _Last);
_Assign_unchecked(_STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
}

#if _HAS_CXX23 && defined(__cpp_lib_concepts) // TRANSITION, GH-395
Expand Down Expand Up @@ -1022,8 +1022,8 @@ public:
_STL_VERIFY(
_Where._Getcont() == _STD addressof(_Mypair._Myval2), "forward_list insert_after location incompatible");
#endif // _ITERATOR_DEBUG_LEVEL == 2
_Adl_verify_range(_First, _Last);
return _Insert_range_after(_Where._Ptr, _Get_unwrapped(_First), _Get_unwrapped(_Last));
_STD _Adl_verify_range(_First, _Last);
return _Insert_range_after(_Where._Ptr, _STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
}

#if _HAS_CXX23 && defined(__cpp_lib_concepts) // TRANSITION, GH-395
Expand Down Expand Up @@ -1275,12 +1275,12 @@ public:

template <class _Pr2>
void merge(forward_list& _Right, _Pr2 _Pred) { // merge in elements from _Right, both ordered by _Pred
_Merge1(_Right, _Pass_fn(_Pred));
_Merge1(_Right, _STD _Pass_fn(_Pred));
}

template <class _Pr2>
void merge(forward_list&& _Right, _Pr2 _Pred) { // merge in elements from _Right, both ordered by _Pred
_Merge1(_Right, _Pass_fn(_Pred));
_Merge1(_Right, _STD _Pass_fn(_Pred));
}

private:
Expand Down Expand Up @@ -1397,7 +1397,7 @@ public:

template <class _Pr2>
void sort(_Pr2 _Pred) { // order sequence
_Scary_val::_Sort(_Mypair._Myval2._Before_head(), _Pass_fn(_Pred));
_Scary_val::_Sort(_Mypair._Myval2._Before_head(), _STD _Pass_fn(_Pred));
}

void reverse() noexcept { // reverse sequence
Expand Down
18 changes: 9 additions & 9 deletions stl/inc/list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,14 +876,14 @@ public:

template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
list(_Iter _First, _Iter _Last) : _Mypair(_Zero_then_variadic_args_t{}) {
_Adl_verify_range(_First, _Last);
_Construct_range_unchecked(_Get_unwrapped(_First), _Get_unwrapped(_Last));
_STD _Adl_verify_range(_First, _Last);
_Construct_range_unchecked(_STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
}

template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
list(_Iter _First, _Iter _Last, const _Alloc& _Al) : _Mypair(_One_then_variadic_args_t{}, _Al) {
_Adl_verify_range(_First, _Last);
_Construct_range_unchecked(_Get_unwrapped(_First), _Get_unwrapped(_Last));
_STD _Adl_verify_range(_First, _Last);
_Construct_range_unchecked(_STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
}

#if _HAS_CXX23 && defined(__cpp_lib_concepts) // TRANSITION, GH-395
Expand Down Expand Up @@ -1334,8 +1334,8 @@ private:
public:
template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
void assign(_Iter _First, _Iter _Last) {
_Adl_verify_range(_First, _Last);
_Assign_unchecked(_Get_unwrapped(_First), _Get_unwrapped(_Last));
_STD _Adl_verify_range(_First, _Last);
_Assign_unchecked(_STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
}

#if _HAS_CXX23 && defined(__cpp_lib_concepts) // TRANSITION, GH-395
Expand Down Expand Up @@ -1391,9 +1391,9 @@ public:
#if _ITERATOR_DEBUG_LEVEL == 2
_STL_VERIFY(_Where._Getcont() == _STD addressof(_Mypair._Myval2), "list insert iterator outside range");
#endif // _ITERATOR_DEBUG_LEVEL == 2
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
_List_node_insert_op2<_Alnode> _Op(_Getal());
_Op._Append_range_unchecked(_Get_unwrapped(_First), _Get_unwrapped(_Last));
_Op._Append_range_unchecked(_STD _Get_unwrapped(_First), _STD _Get_unwrapped(_Last));
return _Make_iter(_Op._Attach_before(_Mypair._Myval2, _Where._Ptr));
}

Expand Down Expand Up @@ -1431,7 +1431,7 @@ private:

public:
iterator erase(const const_iterator _First, const const_iterator _Last) noexcept /* strengthened */ {
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
return _Make_iter(_Unchecked_erase(_First._Ptr, _Last._Ptr));
}

Expand Down
Loading