public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-1138] libstdc++: Apply r13-1096-g6abe341558abec change to vstring too [PR101482] Date: Thu, 16 Jun 2022 19:20:47 +0000 (GMT) [thread overview] Message-ID: <20220616192047.043A13857B80@sourceware.org> (raw) https://gcc.gnu.org/g:51309d1158b85560a975819260776c0ca68fd142 commit r13-1138-g51309d1158b85560a975819260776c0ca68fd142 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Jun 16 11:02:11 2022 +0100 libstdc++: Apply r13-1096-g6abe341558abec change to vstring too [PR101482] As recently done for std::basic_string, __gnu_cxx::__versa_string equality comparisons can check lengths first for any character type and traits type, not only for std::char_traits<char>. libstdc++-v3/ChangeLog: PR libstdc++/101482 * include/ext/vstring.h (operator==): Always check lengths before comparing. Diff: --- libstdc++-v3/include/ext/vstring.h | 45 +++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index 4406695919d..47cbabf24f1 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -2338,18 +2338,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline bool operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs, const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs) - { return __lhs.compare(__rhs) == 0; } + { + return __lhs.size() == __rhs.size() + && !_Traits::compare(__lhs.data(), __rhs.data(), __lhs.size()); + } - template<typename _CharT, + /** + * @brief Test equivalence of string and C string. + * @param __lhs String. + * @param __rhs C string. + * @return True if @a __lhs.compare(@a __rhs) == 0. False otherwise. + */ + template<typename _CharT, typename _Traits, typename _Alloc, template <typename, typename, typename> class _Base> - inline typename __enable_if<std::__is_char<_CharT>::__value, bool>::__type - operator==(const __versa_string<_CharT, std::char_traits<_CharT>, - std::allocator<_CharT>, _Base>& __lhs, - const __versa_string<_CharT, std::char_traits<_CharT>, - std::allocator<_CharT>, _Base>& __rhs) - { return (__lhs.size() == __rhs.size() - && !std::char_traits<_CharT>::compare(__lhs.data(), __rhs.data(), - __lhs.size())); } + inline bool + operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs, + const _CharT* __rhs) + { + return __lhs.size() == _Traits::length(__rhs) + && !_Traits::compare(__lhs.data(), __rhs, __lhs.size()); + } /** * @brief Test equivalence of C string and string. @@ -2362,20 +2370,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline bool operator==(const _CharT* __lhs, const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs) - { return __rhs.compare(__lhs) == 0; } - - /** - * @brief Test equivalence of string and C string. - * @param __lhs String. - * @param __rhs C string. - * @return True if @a __lhs.compare(@a __rhs) == 0. False otherwise. - */ - template<typename _CharT, typename _Traits, typename _Alloc, - template <typename, typename, typename> class _Base> - inline bool - operator==(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs, - const _CharT* __rhs) - { return __lhs.compare(__rhs) == 0; } + { return __rhs == __lhs; } // operator != /** @@ -2402,7 +2397,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline bool operator!=(const _CharT* __lhs, const __versa_string<_CharT, _Traits, _Alloc, _Base>& __rhs) - { return !(__lhs == __rhs); } + { return !(__rhs == __lhs); } /** * @brief Test difference of string and C string.
reply other threads:[~2022-06-16 19:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220616192047.043A13857B80@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).