From a07e3e182d1a00af9ce7bfc6b437f72fa84a2d8b Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 16 Dec 2014 22:13:57 -0800 Subject: [PATCH] cp_find_type_baseclass_by_name: Renamed from find_type_baseclass_by_name. gdb/ChangeLog: * cp-namespace.c (cp_find_type_baseclass_by_name): Renamed from find_type_baseclass_by_name. All callers updated. --- gdb/ChangeLog | 5 +++++ gdb/c-exp.y | 4 ++-- gdb/cp-namespace.c | 4 ++-- gdb/cp-support.h | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 087c9c9f844..bf2fe6fadb0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-12-16 Doug Evans + + * cp-namespace.c (cp_find_type_baseclass_by_name): Renamed from + find_type_baseclass_by_name. All callers updated. + 2014-12-16 Doug Evans * symtab.h (struct symbol_search) : Delete. All uses updated. diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 92ff3b6d4e4..9d1c4c7755e 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -3019,7 +3019,7 @@ classify_inner_name (struct parser_state *par_state, relative to the `this' pointer. */ if (yylval.ssym.sym == NULL) { - struct type *base_type = find_type_baseclass_by_name (type, copy); + struct type *base_type = cp_find_type_baseclass_by_name (type, copy); if (base_type != NULL) { @@ -3038,7 +3038,7 @@ classify_inner_name (struct parser_state *par_state, named COPY when we really wanted a base class of the same name. Double-check this case by looking for a base class. */ { - struct type *base_type = find_type_baseclass_by_name (type, copy); + struct type *base_type = cp_find_type_baseclass_by_name (type, copy); if (base_type != NULL) { diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index c083327454b..30667373ad6 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -697,7 +697,7 @@ cp_lookup_symbol_nonlocal (const char *name, named NAME and return its type. If not found, return NULL. */ struct type * -find_type_baseclass_by_name (struct type *parent_type, const char *name) +cp_find_type_baseclass_by_name (struct type *parent_type, const char *name) { int i; @@ -713,7 +713,7 @@ find_type_baseclass_by_name (struct type *parent_type, const char *name) if (streq (base_name, name)) return type; - type = find_type_baseclass_by_name (type, name); + type = cp_find_type_baseclass_by_name (type, name); if (type != NULL) return type; } diff --git a/gdb/cp-support.h b/gdb/cp-support.h index efd1e18b505..2594e34cc1e 100644 --- a/gdb/cp-support.h +++ b/gdb/cp-support.h @@ -215,8 +215,8 @@ struct type *cp_lookup_transparent_type (const char *name); /* See description in cp-namespace.c. */ -struct type *find_type_baseclass_by_name (struct type *parent_type, - const char *name); +struct type *cp_find_type_baseclass_by_name (struct type *parent_type, + const char *name); /* Functions from cp-name-parser.y. */ -- 2.30.2