public inbox for libstdc++-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 r11-10117] libstdc++: Remove unused functions in std::variant implementation Date: Thu, 7 Jul 2022 23:32:08 +0000 (GMT) [thread overview] Message-ID: <20220707233208.CC07F3850218@sourceware.org> (raw) https://gcc.gnu.org/g:80056e27a6e8b3d00a74343bde931d583561ffe9 commit r11-10117-g80056e27a6e8b3d00a74343bde931d583561ffe9 Author: Jonathan Wakely <jwakely@redhat.com> Date: Fri Oct 15 11:52:08 2021 +0100 libstdc++: Remove unused functions in std::variant implementation These functions aren't used, and accessing the storage as a void* isn't compatible with C++20 constexpr requirements anyway, so we're unlikely to ever start using them in future. libstdc++-v3/ChangeLog: * include/std/variant (_Variant_storage::_M_storage()): Remove. (__detail::__variant::__get_storage): Remove. (variant): Remove friend declaration of __get_storage. (cherry picked from commit 1ba7adabf29eb671e418692fad076ea6edd08e3d) Diff: --- libstdc++-v3/include/std/variant | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index c0585cb5999..f101c426744 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -435,13 +435,6 @@ namespace __variant ~_Variant_storage() { _M_reset(); } - void* - _M_storage() const noexcept - { - return const_cast<void*>(static_cast<const void*>( - std::addressof(_M_u))); - } - constexpr bool _M_valid() const noexcept { @@ -473,13 +466,6 @@ namespace __variant void _M_reset() noexcept { _M_index = static_cast<__index_type>(variant_npos); } - void* - _M_storage() const noexcept - { - return const_cast<void*>(static_cast<const void*>( - std::addressof(_M_u))); - } - constexpr bool _M_valid() const noexcept { @@ -804,11 +790,6 @@ namespace __variant : _FUN_type<_Tp, _Variant> { }; - // Returns the raw storage for __v. - template<typename _Variant> - void* __get_storage(_Variant&& __v) noexcept - { return __v._M_storage(); } - template <typename _Maybe_variant_cookie, typename _Variant> struct _Extra_visit_slot_needed { @@ -1685,10 +1666,6 @@ namespace __variant friend constexpr decltype(auto) __detail::__variant::__get(_Vp&& __v) noexcept; - template<typename _Vp> - friend void* - __detail::__variant::__get_storage(_Vp&& __v) noexcept; - #define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP) \ template<typename... _Tp> \ friend constexpr bool \
reply other threads:[~2022-07-07 23:32 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=20220707233208.CC07F3850218@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).