From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12458 invoked by alias); 20 Jun 2019 14:18:14 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 12440 invoked by uid 89); 20 Jun 2019 14:18:14 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1638, Qualify X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 20 Jun 2019 14:18:13 +0000 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3771D87642; Thu, 20 Jun 2019 14:18:12 +0000 (UTC) Received: from localhost (unknown [10.33.36.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCBAE604A3; Thu, 20 Jun 2019 14:18:11 +0000 (UTC) Date: Thu, 20 Jun 2019 14:18:00 -0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] Qualify calls to __never_valueless in Message-ID: <20190620141811.GA30952@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="KsGdsel6WgEHnImy" Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.11.3 (2019-02-01) X-SW-Source: 2019-06/txt/msg01237.txt.bz2 --KsGdsel6WgEHnImy Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 150 * include/std/variant (_Variant_storage, _Extra_visit_slot_needed): Qualify calls to __never_valueless. Tested x86_64-linux, committed to trunk. --KsGdsel6WgEHnImy Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 1558 commit f432c00da2ed386e356ac23a41a9cf943a2e2c3a Author: redi Date: Thu Jun 20 14:17:51 2019 +0000 Qualify calls to __never_valueless in * include/std/variant (_Variant_storage, _Extra_visit_slot_needed): Qualify calls to __never_valueless. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@272508 138bc75d-0d04-0410-961f-82ee72b054a4 diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index c86b0c8ccf3..d93ea86ea29 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -422,7 +422,7 @@ namespace __variant constexpr bool _M_valid() const noexcept { - if constexpr (__never_valueless<_Types...>()) + if constexpr (__variant::__never_valueless<_Types...>()) return true; return this->_M_index != __index_type(variant_npos); } @@ -456,7 +456,7 @@ namespace __variant constexpr bool _M_valid() const noexcept { - if constexpr (__never_valueless<_Types...>()) + if constexpr (__variant::__never_valueless<_Types...>()) return true; return this->_M_index != __index_type(variant_npos); } @@ -799,7 +799,7 @@ namespace __variant template struct _Variant_never_valueless> - : bool_constant<__never_valueless<_Types...>()> {}; + : bool_constant<__variant::__never_valueless<_Types...>()> {}; static constexpr bool value = (is_same_v<_Maybe_variant_cookie, __variant_cookie> --KsGdsel6WgEHnImy--