From patchwork Tue Nov 15 19:31:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 695211 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 3tJHZm4NbXz9t0J for ; Wed, 16 Nov 2016 06:31:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="c+gNkXMP"; 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:cc:subject:message-id:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=yulLLjaLWr24PH++K O7R34xxucIA8bKcQ9xUrH0pm1fWhU6gV7/B8Zru0smwODA3QXFj6IdVTeMrJhGKt 7HH9Jq5jF9nW8N1YE19+pPhescBGK3JPOa/QZZYIOvuxyk75P8SaDObhhxcqnFnm kbEM/K8cOp8t4OKweAthskzLPU= 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:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=default; bh=gQl19nFFANko19O9g0Ge2Pm RlmE=; b=c+gNkXMPjsO6X8/eNRUmEJDWKHq7jWp/kYgu8raUIJM58NovjrnT+rA cHYSSeGwAsPpvpXPuH+KgzUGRI5M4kR+CmEtYsGteOXA5772JwPNeahWFgqp/+2P m8Pj9pwi32fym2f6Tv27b5nbXW2/St/S9PTq+59Z0qs+AsgUZaWc= Received: (qmail 17734 invoked by alias); 15 Nov 2016 19:31:49 -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 15857 invoked by uid 89); 15 Nov 2016 19:31:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= 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 ESMTP; Tue, 15 Nov 2016 19:31:36 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4777C04D2A1; Tue, 15 Nov 2016 19:31:34 +0000 (UTC) Received: from localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAFJVXpG020087; Tue, 15 Nov 2016 14:31:34 -0500 Date: Tue, 15 Nov 2016 19:31:33 +0000 From: Jonathan Wakely To: Tim Shen Cc: libstdc++ , gcc-patches Subject: Re: [Patch] Remove variant, variant and variant<> Message-ID: <20161115193133.GL3145@redhat.com> References: <20161115120841.GC3145@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161115120841.GC3145@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.7.1 (2016-10-04) On 15/11/16 12:08 +0000, Jonathan Wakely wrote: >On 12/11/16 12:11 -0800, Tim Shen wrote: >>At Issaquah we decided to remove the supports above. > >OK with a suitable ChangeLog, thanks. I've adjusted your ChangeLog entry to fit under 80 columns with TAB set to 8 spaces. I've also adjusted the pretty printer test that was using variant. Tested x86_64-linux, committed to trunk. commit ab5b0b5d8618cd03e4d21a37b782d2726361bde2 Author: Jonathan Wakely Date: Tue Nov 15 19:21:02 2016 +0000 Adjust pretty printer test for variant * testsuite/libstdc++-prettyprinters/cxx17.cc: Adjust test for variant. diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc index bc9b26a..96be8c7 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc @@ -86,8 +86,8 @@ main() // { dg-final { note-test v3 {std::variant [index 1] = {3}} } } variant v4{ str }; // { dg-final { note-test v4 {std::variant [index 2] = {"string"}} } } - variant vref{str}; -// { dg-final { note-test vref {std::variant > &> [index 0] = {"string"}} } } + variant vref{str}; +// { dg-final { note-test vref {std::variant [index 0] = {"string"}} } } map m{ {1, "one"} }; map::node_type n0;