Skip to content

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

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

Merged
Stephan T. Lavavej (StephanTLavavej) 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 1 commit
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
Prev Previous commit
Next Next commit
Consistent _STD in erase, replace, and replace_with_range
  • Loading branch information
@frederick-vs-ja
frederick-vs-ja committed Dec 13, 2023
commit 9c5cd4d853c50dde0eb07e7f70e9068279d7bdb1
2 changes: 1 addition & 1 deletion stl/inc/deque
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,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
2 changes: 1 addition & 1 deletion stl/inc/list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,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
16 changes: 8 additions & 8 deletions stl/inc/xstring
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3164,7 +3164,7 @@ public:
_CONSTEXPR20 basic_string& replace(
const const_iterator _First, const const_iterator _Last, const initializer_list<_Elem> _Ilist) {
// replace with initializer_list
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
#if _ITERATOR_DEBUG_LEVEL != 0
_STL_VERIFY(_First._Getcont() == _STD addressof(_Mypair._Myval2), "string iterators incompatible");
#endif // _ITERATOR_DEBUG_LEVEL != 0
Expand Down Expand Up @@ -3697,7 +3697,7 @@ public:

_CONSTEXPR20 iterator erase(const const_iterator _First, const const_iterator _Last) noexcept
/* strengthened */ {
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
#if _ITERATOR_DEBUG_LEVEL != 0
_STL_VERIFY(_First._Getcont() == _STD addressof(_Mypair._Myval2), "string iterators incompatible");
#endif // _ITERATOR_DEBUG_LEVEL != 0
Expand Down Expand Up @@ -3855,7 +3855,7 @@ public:
_CONSTEXPR20 basic_string& replace(
const const_iterator _First, const const_iterator _Last, const basic_string& _Right) {
// replace [_First, _Last) with _Right
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
#if _ITERATOR_DEBUG_LEVEL != 0
_STL_VERIFY(_First._Getcont() == _STD addressof(_Mypair._Myval2), "string iterators incompatible");
#endif // _ITERATOR_DEBUG_LEVEL != 0
Expand All @@ -3868,7 +3868,7 @@ public:
_CONSTEXPR20 basic_string& replace(
const const_iterator _First, const const_iterator _Last, const _StringViewIsh& _Right) {
// replace [_First, _Last) with _Right
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
#if _ITERATOR_DEBUG_LEVEL != 0
_STL_VERIFY(_First._Getcont() == _STD addressof(_Mypair._Myval2), "string iterators incompatible");
#endif // _ITERATOR_DEBUG_LEVEL != 0
Expand All @@ -3880,7 +3880,7 @@ public:
_CONSTEXPR20 basic_string& replace(const const_iterator _First, const const_iterator _Last,
_In_reads_(_Count) const _Elem* const _Ptr, const size_type _Count) {
// replace [_First, _Last) with [_Ptr, _Ptr + _Count)
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
#if _ITERATOR_DEBUG_LEVEL != 0
_STL_VERIFY(_First._Getcont() == _STD addressof(_Mypair._Myval2), "string iterators incompatible");
#endif // _ITERATOR_DEBUG_LEVEL != 0
Expand All @@ -3891,7 +3891,7 @@ public:
_CONSTEXPR20 basic_string& replace(
const const_iterator _First, const const_iterator _Last, _In_z_ const _Elem* const _Ptr) {
// replace [_First, _Last) with [_Ptr, <null>)
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
#if _ITERATOR_DEBUG_LEVEL != 0
_STL_VERIFY(_First._Getcont() == _STD addressof(_Mypair._Myval2), "string iterators incompatible");
#endif // _ITERATOR_DEBUG_LEVEL != 0
Expand All @@ -3902,7 +3902,7 @@ public:
_CONSTEXPR20 basic_string& replace(
const const_iterator _First, const const_iterator _Last, const size_type _Count, const _Elem _Ch) {
// replace [_First, _Last) with _Count * _Ch
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
#if _ITERATOR_DEBUG_LEVEL != 0
_STL_VERIFY(_First._Getcont() == _STD addressof(_Mypair._Myval2), "string iterators incompatible");
#endif // _ITERATOR_DEBUG_LEVEL != 0
Expand Down Expand Up @@ -3935,7 +3935,7 @@ public:
#if _HAS_CXX23 && defined(__cpp_lib_concepts) // TRANSITION, GH-395
template <_Container_compatible_range<_Elem> _Rng>
constexpr basic_string& replace_with_range(const const_iterator _First, const const_iterator _Last, _Rng&& _Range) {
_Adl_verify_range(_First, _Last);
_STD _Adl_verify_range(_First, _Last);
#if _ITERATOR_DEBUG_LEVEL != 0
_STL_VERIFY(_First._Getcont() == _STD addressof(_Mypair._Myval2), "string iterators incompatible");
#endif // _ITERATOR_DEBUG_LEVEL != 0
Expand Down