From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15057 invoked by alias); 9 Oct 2013 17:17:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 14974 invoked by uid 89); 9 Oct 2013 17:17:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 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; Wed, 09 Oct 2013 17:17:55 +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 (8.14.4/8.14.4) with ESMTP id r99HHrUV017023 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 9 Oct 2013 13:17:54 -0400 Received: from redhat.brq.redhat.com (unused-4-133.brq.redhat.com [10.34.4.133]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r99HHgcA010424; Wed, 9 Oct 2013 13:17:53 -0400 From: Ondrej Oprala To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 04/18] poison "public" Date: Wed, 09 Oct 2013 17:18:00 -0000 Message-Id: <1381339053-14519-5-git-send-email-ooprala@redhat.com> In-Reply-To: <1381339053-14519-1-git-send-email-ooprala@redhat.com> References: <1381339053-14519-1-git-send-email-ooprala@redhat.com> X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00306.txt.bz2 From: Tom Tromey * gdbtypes.c (is_public): Renamed from public. --- gdb/ChangeLog | 4 ++++ gdb/gdbtypes.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index be3cf66..93e30e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -17,6 +17,10 @@ 2013-10-09 Tom Tromey + * gdbtypes.c (is_public): Renamed from public. + +2013-10-09 Tom Tromey + * addrmap.c (self) : Renamed from this. * cp-namespace.c (this_sym) : Likewise. * frame.c (self) : Likewise. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index e32cf97..592e142 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -2139,7 +2139,7 @@ class_types_same_p (const struct type *a, const struct type *b) distance_to_ancestor (A, D, 1) = -1. */ static int -distance_to_ancestor (struct type *base, struct type *dclass, int public) +distance_to_ancestor (struct type *base, struct type *dclass, int is_public) { int i; int d; @@ -2152,10 +2152,10 @@ distance_to_ancestor (struct type *base, struct type *dclass, int public) for (i = 0; i < TYPE_N_BASECLASSES (dclass); i++) { - if (public && ! BASETYPE_VIA_PUBLIC (dclass, i)) + if (is_public && ! BASETYPE_VIA_PUBLIC (dclass, i)) continue; - d = distance_to_ancestor (base, TYPE_BASECLASS (dclass, i), public); + d = distance_to_ancestor (base, TYPE_BASECLASS (dclass, i), is_public); if (d >= 0) return 1 + d; } -- 1.8.3.1