[PATCH 04/18] poison "public"

Ondrej Oprala
2013-10-09T17:17:56Z

From: Tom Tromey <tromey@redhat.com>

* 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 <tromey@redhat.com>

+ * gdbtypes.c (is_public): Renamed from public.
+
+2013-10-09 Tom Tromey <tromey@redhat.com>
+
* 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