From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1464) id 5FCCF3986031; Thu, 3 Sep 2020 16:38:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FCCF3986031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1599151131; bh=V6J51mlXlEn/an2sTZmmTJSBifsMKYD3cKyDsxIE220=; h=From:To:Subject:Date:From; b=eqZP/1MnSx1J+PWFt9AN2YP1MjG+VoU6gLSI3zO5sGNdX1UEuLMtJp+ORwOIc2lki nibTwuXDh9FLiL319DYJ0CeRKp5wnagHc83R7je3g1Pj85B5RZXTJ511MTPBVMOtN2 Ia9LuogjAgbgf8NYudQ6J9DECW821aex+cebq+mc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Peter Bergner To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ibm/heads/gcc-10-branch)] libstdc++: Make variant_npos conversions explicit [PR 96766] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/vendors/ibm/heads/gcc-10-branch X-Git-Oldrev: ed1e7a6a8ad6903ee952e82ac9ddac01efb286dd X-Git-Newrev: 4b6366f24890e25a07f9a045d15633c5b1fb80cb Message-Id: <20200903163851.5FCCF3986031@sourceware.org> Date: Thu, 3 Sep 2020 16:38: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, 03 Sep 2020 16:38:51 -0000 https://gcc.gnu.org/g:4b6366f24890e25a07f9a045d15633c5b1fb80cb commit 4b6366f24890e25a07f9a045d15633c5b1fb80cb Author: Jonathan Wakely 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. (cherry picked from commit 074436cf8cdd2a9ce75cadd36deb8301f00e55b9) 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 0dc3841e777..fa0284d9738 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -385,12 +385,16 @@ namespace __variant template struct _Variant_storage { - constexpr _Variant_storage() : _M_index(variant_npos) { } + constexpr + _Variant_storage() + : _M_index(static_cast<__index_type>(variant_npos)) + { } template - 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 struct _Variant_storage { - constexpr _Variant_storage() : _M_index(variant_npos) { } + constexpr + _Variant_storage() + : _M_index(static_cast<__index_type>(variant_npos)) + { } template - 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;