From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id A528D3858419; Thu, 14 Oct 2021 21:19:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A528D3858419 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 r12-4419] libstdc++: Simplify variant access functions X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 373acac1c8f2d64409ccea6aea409a0e15e80a6a X-Git-Newrev: 4f87d4c5aec9a1eaca7be61e5c8aab4d6e61b1d8 Message-Id: <20211014211951.A528D3858419@sourceware.org> Date: Thu, 14 Oct 2021 21:19:51 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2021 21:19:51 -0000 https://gcc.gnu.org/g:4f87d4c5aec9a1eaca7be61e5c8aab4d6e61b1d8 commit r12-4419-g4f87d4c5aec9a1eaca7be61e5c8aab4d6e61b1d8 Author: Jonathan Wakely Date: Thu Oct 14 20:37:38 2021 +0100 libstdc++: Simplify variant access functions libstdc++-v3/ChangeLog: * include/std/variant (__variant::__get(in_place_index_t, U&&)): Rename to __get_n and remove first argument. Replace pair of overloads with a single function using 'if constexpr'. (__variant::__get(Variant&&)): Adjust to use __get_n. Diff: --- libstdc++-v3/include/std/variant | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 6377b6731ea..b85a89d0b7b 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -279,27 +279,26 @@ namespace __variant __gnu_cxx::__aligned_membuf<_Type> _M_storage; }; - template - constexpr decltype(auto) - __get(in_place_index_t<0>, _Union&& __u) noexcept - { return std::forward<_Union>(__u)._M_first._M_get(); } - template constexpr decltype(auto) - __get(in_place_index_t<_Np>, _Union&& __u) noexcept + __get_n(_Union&& __u) noexcept { - return __variant::__get(in_place_index<_Np-1>, - std::forward<_Union>(__u)._M_rest); + if constexpr (_Np == 0) + return std::forward<_Union>(__u)._M_first._M_get(); + else if constexpr (_Np == 1) + return std::forward<_Union>(__u)._M_rest._M_first._M_get(); + else if constexpr (_Np == 2) + return std::forward<_Union>(__u)._M_rest._M_rest._M_first._M_get(); + else + return __variant::__get_n<_Np - 3>( + std::forward<_Union>(__u)._M_rest._M_rest._M_rest); } // Returns the typed storage for __v. template constexpr decltype(auto) __get(_Variant&& __v) noexcept - { - return __variant::__get(std::in_place_index<_Np>, - std::forward<_Variant>(__v)._M_u); - } + { return __variant::__get_n<_Np>(std::forward<_Variant>(__v)._M_u); } template struct _Traits