From patchwork Thu Aug 1 12:25:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Butcher X-Patchwork-Id: 264424 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 1CE9B2C0087 for ; Sat, 3 Aug 2013 23:30:41 +1000 (EST) 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:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=RDoiFmhJLbX6Z60CMqtysK0lk6mKQ6NM6aG5XOjs3DUKDJqV037XA 7d3ZT2KKXiQWWMAX9MKlTwjtYrrlCT61eQN2HlKHY+E4WDj2yJ+wm13zxckoZyLO S3dLbIbIIzC4LV/IO8Uk7FiVc4F86UiEM1R4kkSSVV6pVtXatBRCTQ= 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:cc:subject:date:message-id:in-reply-to:references; s= default; bh=dteKv3X492L77OaMVcpFOmYYtqo=; b=EKR9RhW8wr+1JlqwvzoT N2Sn6PBiSb8C58dxgskeGcGV8oT3fmxC5L8j57hfv/352xL0mx2jbVMe3W/g2vya KkXbSa2ivk26rIMM3CpR9S2zTkXdAY+q3y5JJ4E0Nu1QTzdnStYhvp+7Iu9PyyrP dJt8g88SUx4KRbFTh6dSCO8= Received: (qmail 10147 invoked by alias); 3 Aug 2013 13:29:43 -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 10068 invoked by uid 89); 3 Aug 2013 13:29:43 -0000 X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RDNS_NONE, SPF_PASS autolearn=ham version=3.3.1 Received: from Unknown (HELO mail-wi0-f173.google.com) (209.85.212.173) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Sat, 03 Aug 2013 13:29:42 +0000 Received: by mail-wi0-f173.google.com with SMTP id en1so273936wid.12 for ; Sat, 03 Aug 2013 06:29:34 -0700 (PDT) X-Received: by 10.180.72.134 with SMTP id d6mr1815412wiv.8.1375536574536; Sat, 03 Aug 2013 06:29:34 -0700 (PDT) Received: from archbang.lan (munkyhouse.force9.co.uk. [84.92.244.81]) by mx.google.com with ESMTPSA id z2sm9436380wiv.11.2013.08.03.06.29.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 03 Aug 2013 06:29:33 -0700 (PDT) From: Adam Butcher To: Jason Merrill Cc: gcc-patches@gcc.gnu.org, Gabriel Dos Reis , Andrew Sutton , Adam Butcher Subject: [PATCH 4/4] Grammar "it's" to "its". Date: Thu, 1 Aug 2013 13:25:30 +0100 Message-Id: <1375359930-12871-5-git-send-email-adam@jessamine.co.uk> In-Reply-To: <1375359930-12871-1-git-send-email-adam@jessamine.co.uk> References: <51E96FB9.6090108@redhat.com> <1375359930-12871-1-git-send-email-adam@jessamine.co.uk> --- gcc/cp/pt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index a7baaba..99bc71b 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -1986,7 +1986,7 @@ determine_specialization (tree template_id, tree decl_arg_types; /* This is an ordinary member function. However, since - we're here, we can assume it's enclosing class is a + we're here, we can assume its enclosing class is a template class. For example, template struct S { void f(); }; @@ -4337,7 +4337,7 @@ check_default_tmpl_args (tree decl, tree parms, bool is_primary, || DECL_INITIALIZED_IN_CLASS_P (decl))) /* We already checked these parameters when the template was declared, so there's no need to do it again now. This function - was defined in class scope, but we're processing it's body now + was defined in class scope, but we're processing its body now that the class is complete. */ return true; @@ -7482,7 +7482,7 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context, the one of #0. When we encounter #1, we want to store the partial instantiation - of M (template S::M) in it's CLASSTYPE_TI_TEMPLATE. + of M (template S::M) in its CLASSTYPE_TI_TEMPLATE. For all cases other than this "explicit specialization of member of a class template", we just want to store the most general template into