Skip to content

[libc++] [string_view] Remove operators made redundant by C++20 #66206

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
merged 1 commit into from
Sep 18, 2023
Merged

[libc++] [string_view] Remove operators made redundant by C++20 #66206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 28 additions & 37 deletions libcxx/include/string_view
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,35 @@ template <ranges::contiguous_range _Range>
#endif

// [string.view.comparison]

#if _LIBCPP_STD_VER >= 20

template<class _CharT, class _Traits>
_LIBCPP_HIDE_FROM_ABI constexpr
bool operator==(basic_string_view<_CharT, _Traits> __lhs,
type_identity_t<basic_string_view<_CharT, _Traits>> __rhs) noexcept {
if (__lhs.size() != __rhs.size()) return false;
return __lhs.compare(__rhs) == 0;
}

template <class _CharT, class _Traits>
_LIBCPP_HIDE_FROM_ABI constexpr auto operator<=>(
basic_string_view<_CharT, _Traits> __lhs, type_identity_t<basic_string_view<_CharT, _Traits>> __rhs) noexcept {
if constexpr (requires { typename _Traits::comparison_category; }) {
// [string.view]/4
static_assert(
__comparison_category<typename _Traits::comparison_category>,
"return type is not a comparison category type");
return static_cast<typename _Traits::comparison_category>(__lhs.compare(__rhs) <=> 0);
} else {
return static_cast<weak_ordering>(__lhs.compare(__rhs) <=> 0);
}
}

#else

// operator ==

template<class _CharT, class _Traits>
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
bool operator==(basic_string_view<_CharT, _Traits> __lhs,
Expand All @@ -797,8 +825,6 @@ bool operator==(basic_string_view<_CharT, _Traits> __lhs,
return __lhs.compare(__rhs) == 0;
}

#if _LIBCPP_STD_VER < 20
// This overload is automatically generated in C++20.
template<class _CharT, class _Traits, int = 2>
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_INLINE_VISIBILITY
bool operator==(__type_identity_t<basic_string_view<_CharT, _Traits> > __lhs,
Expand All @@ -807,41 +833,6 @@ bool operator==(__type_identity_t<basic_string_view<_CharT, _Traits> > __lhs,
if (__lhs.size() != __rhs.size()) return false;
return __lhs.compare(__rhs) == 0;
}
#endif // _LIBCPP_STD_VER >= 20

// operator <=>

#if _LIBCPP_STD_VER >= 20

template <class _CharT, class _Traits>
_LIBCPP_HIDE_FROM_ABI constexpr auto
operator<=>(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) noexcept {
if constexpr (requires { typename _Traits::comparison_category; }) {
// [string.view]/4
static_assert(
__comparison_category<typename _Traits::comparison_category>,
"return type is not a comparison category type");
return static_cast<typename _Traits::comparison_category>(__lhs.compare(__rhs) <=> 0);
} else {
return static_cast<weak_ordering>(__lhs.compare(__rhs) <=> 0);
}
}

template <class _CharT, class _Traits, int = 1>
_LIBCPP_HIDE_FROM_ABI constexpr auto operator<=>(
basic_string_view<_CharT, _Traits> __lhs, type_identity_t<basic_string_view<_CharT, _Traits>> __rhs) noexcept {
if constexpr (requires { typename _Traits::comparison_category; }) {
// [string.view]/4
static_assert(
__comparison_category<typename _Traits::comparison_category>,
"return type is not a comparison category type");
return static_cast<typename _Traits::comparison_category>(__lhs.compare(__rhs) <=> 0);
} else {
return static_cast<weak_ordering>(__lhs.compare(__rhs) <=> 0);
}
}

#else // _LIBCPP_STD_VER >= 20

// operator !=
template<class _CharT, class _Traits>
Expand Down