From patchwork Tue Jan 12 19:39:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 566721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 61CBA140556 for ; Wed, 13 Jan 2016 06:40:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=d/1DHoOq; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; q=dns; s=default; b=upCxNFfrQgVKb7ynP7TvbC00NGD0nw rQ9RnaDc/Ab1HmfzGo0rnKkt0bmwC+aAuK0StC61obdAl1UazMgMvJGKxqZsCrmP flUcK1qirE32L45Vc5lVIdp4PR2kd/4IipOTvbvR0MSJW4jTBgVguQmqL5Ig2Asm OMNE5Gl6KJA70= 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:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; s=default; bh=iuAL3GzknmiTBdVFKABZMkceN0c=; b=d/1D HoOqq2DO/QP6Lrl12IqXfGu3E0+SGIUx1gkPdR7JE54iTuttHuVv3R8zf550xPeE jVIkg0vC7MaG6fgsr1RDyxNawaf4bdwceQMKY5HhiDpwKz55gAKRWOy8PbYmXTEP VvOiyQZjd/qY7d5LWBfjL2EHfV6cpqHMtZzaMRA= Received: (qmail 71769 invoked by alias); 12 Jan 2016 19:40:03 -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 71743 invoked by uid 89); 12 Jan 2016 19:40:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=func2, 253, rude, 480 X-Spam-User: qpsmtpd, 2 recipients 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 12 Jan 2016 19:39:52 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id F419B4464C; Tue, 12 Jan 2016 19:39:50 +0000 (UTC) Received: from localhost (ovpn-116-38.ams2.redhat.com [10.36.116.38]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0CJdoxP030165; Tue, 12 Jan 2016 14:39:50 -0500 Date: Tue, 12 Jan 2016 19:39:49 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [patch] libstdc++/68276 and libstdc++68995 qualification in Message-ID: <20160112193949.GC30323@redhat.com> References: <20151221130212.GZ5356@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20151221130212.GZ5356@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.5.24 (2015-08-30) On 21/12/15 13:02 +0000, Jonathan Wakely wrote: >Two patches to add missing std:: qualification to prevent ADL >problems. Both are regressions, 68276 only on trunk, but 68995 has >been broken since 4.8.0 (but only affects people mixing TR1 with >C++11, and I was already rude about them in Bugzilla so won't do it >again here ;-) For the branches I added a better test for 68995, this extends the test on trunk to match what's on the branches now. Tested x86_64-linux, committed to trunk. commit 574125855cb79becc19ed564040a0ca1b23ebabc Author: Jonathan Wakely Date: Tue Jan 12 19:19:02 2016 +0000 Extend std::function test for PR 68995 * testsuite/20_util/function/68995.cc: Test reference_wrapper cases. diff --git a/libstdc++-v3/testsuite/20_util/function/68995.cc b/libstdc++-v3/testsuite/20_util/function/68995.cc index 78712d6..5690657 100644 --- a/libstdc++-v3/testsuite/20_util/function/68995.cc +++ b/libstdc++-v3/testsuite/20_util/function/68995.cc @@ -25,3 +25,8 @@ std::tr1::shared_ptr test() { return {}; } std::function()> func = test; +std::function()> funcr = std::ref(test); + +void test2(std::tr1::shared_ptr) { } + +std::function)> func2 = std::ref(test2);