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

Jump to bottom

<xstring>: Strengthen exception specification for sv.compare("NTBS") #3738

Merged
merged 7 commits into from
Jun 15, 2023
Merged

<xstring>: Strengthen exception specification for sv.compare("NTBS") #3738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
206dc6f
Strengthen exception specification for `sv.compare(psz)`
frederick-vs-ja May 28, 2023
5e73592
Correspondingly modify the test file
frederick-vs-ja May 28, 2023
f8c484b
Missed ` // strengthened` comment
frederick-vs-ja May 28, 2023
a18c3f4
Also `_Eos`, `_Swap_proxy_and_iterators`, and `_Swap_data`
frederick-vs-ja May 28, 2023
5a05f1a
Update tests/std/tests/P0220R1_string_view/test.cpp
strega-nil-ms Jun 14, 2023
5ec275c
Revert "Update tests/std/tests/P0220R1_string_view/test.cpp"
StephanTLavavej Jun 14, 2023
a58bd4c
Mechanically replace P0220R1_string_view to use terse static_assert.
StephanTLavavej Jun 14, 2023
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
9 changes: 5 additions & 4 deletions stl/inc/xstring
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,8 @@ public:
return substr(_Off, _Nx).compare(_Right.substr(_Roff, _Count));
}

_NODISCARD constexpr int compare(_In_z_ const _Elem* const _Ptr) const { // compare [0, _Mysize) with [_Ptr, <null>)
_NODISCARD constexpr int compare(_In_z_ const _Elem* const _Ptr) const noexcept /* strengthened */ {
// compare [0, _Mysize) with [_Ptr, <null>)
return compare(basic_string_view(_Ptr));
}

Expand Down Expand Up @@ -4258,7 +4259,7 @@ public:
_Construct_in_place(_Starts_small._Bx._Ptr, _Ptr);
}

_CONSTEXPR20 void _Swap_data(basic_string& _Right) {
_CONSTEXPR20 void _Swap_data(basic_string& _Right) noexcept {
using _STD swap;

auto& _My_data = _Mypair._Myval2;
Expand Down Expand Up @@ -4810,7 +4811,7 @@ private:
_My_data._Myres = _BUF_SIZE - 1;
}

_CONSTEXPR20 void _Eos(const size_type _New_size) { // set new length and null terminator
_CONSTEXPR20 void _Eos(const size_type _New_size) noexcept { // set new length and null terminator
_ASAN_STRING_MODIFY(*this, _Mypair._Myval2._Mysize, _New_size);
_Traits::assign(_Mypair._Myval2._Myptr()[_Mypair._Myval2._Mysize = _New_size], _Elem());
}
Expand Down Expand Up @@ -4850,7 +4851,7 @@ public:
}

private:
_CONSTEXPR20 void _Swap_proxy_and_iterators(basic_string& _Right) {
_CONSTEXPR20 void _Swap_proxy_and_iterators(basic_string& _Right) noexcept {
_Mypair._Myval2._Swap_proxy_and_iterators(_Right._Mypair._Myval2);
}

Expand Down
Loading