From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 7F8F13858D1E; Fri, 30 Sep 2022 20:56:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7F8F13858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664571410; bh=ElHye8CtQgqFk59kHIia9BMx5kn6w5M8kp2eWg/mRRc=; h=From:To:Subject:Date:From; b=k6FQAnWOA8cFSP/Y+zdmiETK+blY52Cuvp97bUAFu0NbD74nqWai7XcNhEpjySxXO 75cUaX88pQ0C1wQcdY21UWd2iew5slhha5FauoHI/EXNqmcfV7BybiXZElsJWNcYBK yM3SwrCgeFIC+LmeSlXQd5Hq047SUVGEnO9zyLXs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-2997] libstdc++: Remove non-standard public members in std::bitset X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 7069d03ba4ad6133225b89d433d9e86f0b0745b8 X-Git-Newrev: 4eb46f453cc74adf0055dae35cec41f4a4c4be5b Message-Id: <20220930205650.7F8F13858D1E@sourceware.org> Date: Fri, 30 Sep 2022 20:56:50 +0000 (GMT) List-Id: https://gcc.gnu.org/g:4eb46f453cc74adf0055dae35cec41f4a4c4be5b commit r13-2997-g4eb46f453cc74adf0055dae35cec41f4a4c4be5b Author: Jonathan Wakely Date: Fri Sep 30 14:57:24 2022 +0100 libstdc++: Remove non-standard public members in std::bitset This makes _M_copy_from_ptr, _M_copy_from_string and _M_copy_to_string private, and declares operator<< and operator>> as friends. Also remove the historical _M_copy_from_string and _M_copy_to_string overloads. Those were used before DR 396 was implemented but are not needed now. There are no tests or docs describing them, so I don't think we intend to support them as extensions. libstdc++-v3/ChangeLog: * include/std/bitset (_M_copy_from_ptr, _M_copy_from_string) (_M_copy_to_string): Change access to private. (_M_copy_from_string(const basic_string&, size_t, size_t)): Remove. (_M_copy_to_string(const basic_string&)): Remove. Diff: --- libstdc++-v3/include/std/bitset | 69 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index 3fe8b18735c..757da020ffe 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -1321,42 +1321,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return to_string, std::allocator >(__zero, __one); } - - // Helper functions for string operations. - template - _GLIBCXX23_CONSTEXPR - void - _M_copy_from_ptr(const _CharT*, size_t, size_t, size_t, - _CharT, _CharT); - - template - _GLIBCXX23_CONSTEXPR - void - _M_copy_from_string(const std::basic_string<_CharT, - _Traits, _Alloc>& __s, size_t __pos, size_t __n, - _CharT __zero, _CharT __one) - { _M_copy_from_ptr<_CharT, _Traits>(__s.data(), __s.size(), __pos, __n, - __zero, __one); } - - template - _GLIBCXX23_CONSTEXPR - void - _M_copy_to_string(std::basic_string<_CharT, _Traits, _Alloc>&, - _CharT, _CharT) const; - - // NB: Backward compat. - template - _GLIBCXX23_CONSTEXPR - void - _M_copy_from_string(const std::basic_string<_CharT, - _Traits, _Alloc>& __s, size_t __pos, size_t __n) - { _M_copy_from_string(__s, __pos, __n, _CharT('0'), _CharT('1')); } - - template - _GLIBCXX23_CONSTEXPR - void - _M_copy_to_string(std::basic_string<_CharT, _Traits,_Alloc>& __s) const - { _M_copy_to_string(__s, _CharT('0'), _CharT('1')); } #endif // HOSTED /// Returns the number of bits which are set. @@ -1463,6 +1427,39 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER size_t _Find_next(size_t __prev) const _GLIBCXX_NOEXCEPT { return this->_M_do_find_next(__prev, _Nb); } + + private: + // Helper functions for string operations. + template + _GLIBCXX23_CONSTEXPR + void + _M_copy_from_ptr(const _CharT*, size_t, size_t, size_t, + _CharT, _CharT); + +#if _GLIBCXX_HOSTED + template + _GLIBCXX23_CONSTEXPR + void + _M_copy_from_string(const std::basic_string<_CharT, + _Traits, _Alloc>& __s, size_t __pos, size_t __n, + _CharT __zero, _CharT __one) + { _M_copy_from_ptr<_CharT, _Traits>(__s.data(), __s.size(), __pos, __n, + __zero, __one); } + + template + _GLIBCXX23_CONSTEXPR + void + _M_copy_to_string(std::basic_string<_CharT, _Traits, _Alloc>&, + _CharT, _CharT) const; + + template + friend std::basic_istream<_CharT, _Traits>& + operator>>(std::basic_istream<_CharT, _Traits>&, bitset<_Nb2>&); + + template + friend std::basic_ostream<_CharT, _Traits>& + operator<<(std::basic_ostream<_CharT, _Traits>&, const bitset<_Nb2>&); +#endif }; #if _GLIBCXX_HOSTED