From patchwork Fri May 27 03:58:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 97652 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]) by ozlabs.org (Postfix) with SMTP id 54B7AB6F8E for ; Fri, 27 May 2011 13:59:16 +1000 (EST) Received: (qmail 32190 invoked by alias); 27 May 2011 03:59:13 -0000 Received: (qmail 32179 invoked by uid 22791); 27 May 2011 03:59:13 -0000 X-SWARE-Spam-Status: No, hits=-6.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 May 2011 03:58:57 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4R3wvkD005180 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 26 May 2011 23:58:57 -0400 Received: from [127.0.0.1] (ovpn-113-23.phx2.redhat.com [10.3.113.23]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4R3wuDH008410 for ; Thu, 26 May 2011 23:58:57 -0400 Message-ID: <4DDF2180.9050408@redhat.com> Date: Thu, 26 May 2011 23:58:56 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc14 Lightning/1.0b2 Thunderbird/3.1.10 MIME-Version: 1.0 To: gcc-patches List Subject: Re: C++ PATCH for c++/47721 (N1791, friend T) References: <4DDF2129.8010608@redhat.com> In-Reply-To: <4DDF2129.8010608@redhat.com> 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 And as a prerequisite for that testcase, I needed to implement DR 1004, dropping the pedwarn about using an injected class name as a template template parameter. Tested x86_64-pc-linux-gnu, applying to trunk. commit 0407c6ff58d0e7033de64040ce66d60a85b709e5 Author: Jason Merrill Date: Thu May 26 15:00:08 2011 -0400 DR 1004 * pt.c (convert_template_argument): Don't complain about using injected-class-name as template template argument. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 3b26700..28c82b8 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5962,7 +5962,9 @@ convert_template_argument (tree parm, tree t = maybe_get_template_decl_from_type_decl (TYPE_NAME (arg)); if (TREE_CODE (t) == TEMPLATE_DECL) { - if (complain & tf_warning_or_error) + if (cxx_dialect >= cxx0x) + /* OK under DR 1004. */; + else if (complain & tf_warning_or_error) pedwarn (input_location, OPT_pedantic, "injected-class-name %qD" " used as template template argument", TYPE_NAME (arg)); else if (flag_pedantic_errors)