public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: William Schmidt <wschmidt@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/wschmidt/heads/builtins3)] libstdc++: Make variant_npos conversions explicit [PR 96766] Date: Fri, 28 Aug 2020 19:57:22 +0000 (GMT) [thread overview] Message-ID: <20200828195722.ED6AE386F039@sourceware.org> (raw) https://gcc.gnu.org/g:074436cf8cdd2a9ce75cadd36deb8301f00e55b9 commit 074436cf8cdd2a9ce75cadd36deb8301f00e55b9 Author: Jonathan Wakely <jwakely@redhat.com> Date: Mon Aug 24 16:10:07 2020 +0100 libstdc++: Make variant_npos conversions explicit [PR 96766] libstdc++-v3/ChangeLog: PR libstdc++/96766 * include/std/variant (_Variant_storage): Replace implicit conversions from size_t to __index_type with explicit casts. Diff: --- libstdc++-v3/include/std/variant | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index eb3d6779205..dd8847cf829 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -385,12 +385,16 @@ namespace __variant template<typename... _Types> struct _Variant_storage<false, _Types...> { - constexpr _Variant_storage() : _M_index(variant_npos) { } + constexpr + _Variant_storage() + : _M_index(static_cast<__index_type>(variant_npos)) + { } template<size_t _Np, typename... _Args> - constexpr _Variant_storage(in_place_index_t<_Np>, _Args&&... __args) + constexpr + _Variant_storage(in_place_index_t<_Np>, _Args&&... __args) : _M_u(in_place_index<_Np>, std::forward<_Args>(__args)...), - _M_index(_Np) + _M_index{_Np} { } void _M_reset() @@ -403,7 +407,7 @@ namespace __variant std::_Destroy(std::__addressof(__this_mem)); }, __variant_cast<_Types...>(*this)); - _M_index = variant_npos; + _M_index = static_cast<__index_type>(variant_npos); } ~_Variant_storage() @@ -432,16 +436,20 @@ namespace __variant template<typename... _Types> struct _Variant_storage<true, _Types...> { - constexpr _Variant_storage() : _M_index(variant_npos) { } + constexpr + _Variant_storage() + : _M_index(static_cast<__index_type>(variant_npos)) + { } template<size_t _Np, typename... _Args> - constexpr _Variant_storage(in_place_index_t<_Np>, _Args&&... __args) + constexpr + _Variant_storage(in_place_index_t<_Np>, _Args&&... __args) : _M_u(in_place_index<_Np>, std::forward<_Args>(__args)...), - _M_index(_Np) + _M_index{_Np} { } void _M_reset() noexcept - { _M_index = variant_npos; } + { _M_index = static_cast<__index_type>(variant_npos); } void* _M_storage() const noexcept @@ -455,7 +463,7 @@ namespace __variant { if constexpr (__variant::__never_valueless<_Types...>()) return true; - return this->_M_index != __index_type(variant_npos); + return this->_M_index != static_cast<__index_type>(variant_npos); } _Variadic_union<_Types...> _M_u;
reply other threads:[~2020-08-28 19:57 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=20200828195722.ED6AE386F039@sourceware.org \ --to=wschmidt@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).