From patchwork Thu May 3 18:55:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duarte Nunes X-Patchwork-Id: 908177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-477198-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=scylladb.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="rV/spL68"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40cPVM6pBBz9s3G for ; Fri, 4 May 2018 04:55:38 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id; q=dns; s=default; b=ZTCp72260/+GTw+ TQMT7lUT6jV4sabruBMpy3NMBGiKmqFU8v2yJv/kDO3yGkGCajoalhtBO7RBwHzF 6gDbsYES+w2obCI9pSHXMMkT/dAI99DTl9nONOUElemLF8/UaiU16+PHdF6+CO4M kEpHz09bqGKmYGLzRje4FNUYTk38= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id; s=default; bh=xRp3xXYH4+Gwh5GnweAJM OYEq0k=; b=rV/spL68powAnpXPCj2Tkzp2htrRF466jmgXJFCbBZKrP7QcrrhjG suxrPAG0wS3kpEHcmkAZ0OHbPg4PijQjpgS6fg4784XrLnCgCYEYwZMZWGYIGZ9c SgPEiD8HRXWxcZ+fg86kP/u8UqJsdI/KSvKIwdJ6Qmk1U6Ndfw+GIg= Received: (qmail 21644 invoked by alias); 3 May 2018 18:55:29 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 21616 invoked by uid 89); 3 May 2018 18:55:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=qualify, __detail, ADL, adl X-HELO: mail-wm0-f66.google.com Received: from mail-wm0-f66.google.com (HELO mail-wm0-f66.google.com) (74.125.82.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 03 May 2018 18:55:27 +0000 Received: by mail-wm0-f66.google.com with SMTP id f8-v6so639565wmc.4 for ; Thu, 03 May 2018 11:55:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=CeKCLfqVhhK8uSapfwurzs9r+AyfksXFMWAErlzWUNU=; b=HQM0g0i0pO7DcpnTsoI7mpqnIWY3ROaKWfezNu7oXPzbM1HfqHOKYrCseVwXgdep22 WDQoPOoahv3Am7gztbkYg6OZHk69u4zxBNx5+zqrXityGlNT5p0GO7A9eKh0C6JRBR+G Ssgv4Cvr3aPTFRGa5gdOZ6K1K/YFmABviwc0O5Y6R14KiVj93nutCInCq02UWHvOmXKo v6psJb2U0IhSVyOqvb4RddU0VoyygUqqZkJuZfsdMnc/as5O0q4BJUhtSS2swnjV38XQ /ODmSFn+s+13c6H3Yy41fBd9UPzt2njduZg3g3uZt9xgA6SG9AgekaOvcph/kBfjtVDm KANQ== X-Gm-Message-State: ALQs6tCyb4ABs45Ib0f+jMNM7wgv1u/BDkc5KVC8J24980Ht9ZhOPbCo i4alzQliFQQYOIcMfXHjGmTx6fIhklA= X-Google-Smtp-Source: AB8JxZqsVtwYFxAtAS4vQDWpwE0zRxbdRHL2CAP7JdEUx+OjbqBBRvjWY1mN49gTFIPUdzrRmH7JBg== X-Received: by 10.28.71.1 with SMTP id u1mr13980408wma.42.1525373724967; Thu, 03 May 2018 11:55:24 -0700 (PDT) Received: from costanza.home (a109-49-81-195.cpe.netcabo.pt. [109.49.81.195]) by smtp.gmail.com with ESMTPSA id f192sm180736wmg.14.2018.05.03.11.55.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 11:55:24 -0700 (PDT) From: Duarte Nunes To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH v1] PR libstdc++/84769 qualify std::get to avoid ADL Date: Thu, 3 May 2018 20:55:22 +0200 Message-Id: <20180503185522.1734-1-duarte@scylladb.com> PR libstdc++/84769 * include/std/variant (visit<_Visitor, _Variants...>): Qualify call to std::get<_Np, _Types...>. Signed-off-by: Duarte Nunes --- ChangeLog | 6 ++++++ libstdc++-v3/include/std/variant | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ec03a5bcdad..bf2c58aee2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-05-03 Duarte Nunes + +PR libstdc++/84769 + * include/std/variant (visit<_Visitor, _Variants...>): + Qualify call to std::get<_Np, _Types...>. + 2018-05-01 Francois H. Theron * configure.ac: Added "nfp" target. diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index f64c037a514..40b3b566938 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1389,7 +1389,7 @@ namespace __variant using _Result_type = decltype(std::forward<_Visitor>(__visitor)( - get<0>(std::forward<_Variants>(__variants))...)); + std::get<0>(std::forward<_Variants>(__variants))...)); constexpr auto& __vtable = __detail::__variant::__gen_vtable< _Result_type, _Visitor&&, _Variants&&...>::_S_vtable;