From 59da4d04cbce4d4209f7e88f8fc3532ef289a99e Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Fri, 12 Dec 2014 22:33:26 -0800 Subject: [PATCH] Rename cp_is_anonymous to cp_is_in_anonymous. gdb/ChangeLog: * cp-support.h (cp_is_in_anonymous): Renamed from cp_is_anonymous. All callers updated. Rename arg "namespace" to "symbol_name". --- gdb/ChangeLog | 5 +++++ gdb/cp-namespace.c | 8 ++++---- gdb/cp-support.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 451f9ed8615..f2bdec78920 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Doug Evans + + * cp-support.h (cp_is_in_anonymous): Renamed from cp_is_anonymous. + All callers updated. Rename arg "namespace" to "symbol_name". + 2014-12-12 Doug Evans * psymtab.c (psym_map_symtabs_matching_filename): Renamed from diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index b4004a781b8..c083327454b 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -52,7 +52,7 @@ cp_scan_for_anonymous_namespaces (const struct symbol *const symbol, /* Start with a quick-and-dirty check for mention of "(anonymous namespace)". */ - if (!cp_is_anonymous (name)) + if (!cp_is_in_anonymous (name)) return; previous_component = 0; @@ -196,9 +196,9 @@ cp_add_using_directive (const char *dest, namespace; return nonzero if so. */ int -cp_is_anonymous (const char *namespace) +cp_is_in_anonymous (const char *symbol_name) { - return (strstr (namespace, CP_ANONYMOUS_NAMESPACE_STR) + return (strstr (symbol_name, CP_ANONYMOUS_NAMESPACE_STR) != NULL); } @@ -331,7 +331,7 @@ cp_lookup_symbol_in_namespace (const char *namespace, strcat (concatenated_name, "::"); strcat (concatenated_name, name); return lookup_symbol_file (concatenated_name, block, domain, - cp_is_anonymous (namespace), search); + cp_is_in_anonymous (namespace), search); } } diff --git a/gdb/cp-support.h b/gdb/cp-support.h index ede16f09e0b..efd1e18b505 100644 --- a/gdb/cp-support.h +++ b/gdb/cp-support.h @@ -179,7 +179,7 @@ extern struct type *cp_lookup_rtti_type (const char *name, /* Functions/variables from cp-namespace.c. */ -extern int cp_is_anonymous (const char *namespace); +extern int cp_is_in_anonymous (const char *symbol_name); extern void cp_add_using_directive (const char *dest, const char *src,