diff options
| author | Keith Seitz <keiths@redhat.com> | 2011-05-31 21:54:07 +0000 |
|---|---|---|
| committer | Keith Seitz <keiths@redhat.com> | 2011-05-31 21:54:07 +0000 |
| commit | 2b1dbab03d9b512f15900cb274f69214bd88d3bc (patch) | |
| tree | 5585a8b827c7e5c67067a6d2e1e07c67572afb57 /gdb/cp-namespace.c | |
| parent | 0a5b1e09bf62fcbe776eb641640f802f64bb6169 (diff) | |
| download | gdb-2b1dbab03d9b512f15900cb274f69214bd88d3bc.zip gdb-2b1dbab03d9b512f15900cb274f69214bd88d3bc.tar.gz gdb-2b1dbab03d9b512f15900cb274f69214bd88d3bc.tar.bz2 | |
PR symtab/12704
* cp-namespace.c (ANONYMOUS_NAMESPACE_LEN): Remove.
(cp_scan_for_anonymous_namespaces): Use CP_ANONYMOUS_NAMESPACE_STR
and CP_ANONYMOUS_NAMESPACE_LEN.
(cp_is_anonymous): Likewise.
* cp-support.h (CP_ANONYMOUS_NAMESPACE_STR): Define.
(CP_ANONYMOUS_NAMESPACE_LEN): Define.
* dwarf2read.c (namespace_name): Likewise.
(fixup_partial_die): Likewise.
* linespec.c (decode_compound): If CP_ANONYMOUS_NAMESPACE_STR is
seen in the input, keep it.
Diffstat (limited to 'gdb/cp-namespace.c')
| -rw-r--r-- | gdb/cp-namespace.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index 00c68b3..7ff7bf7 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -52,10 +52,6 @@ static struct type *cp_lookup_transparent_type_loop (const char *name, /* Check to see if SYMBOL refers to an object contained within an anonymous namespace; if so, add an appropriate using directive. */ -/* Optimize away strlen ("(anonymous namespace)"). */ - -#define ANONYMOUS_NAMESPACE_LEN 21 - void cp_scan_for_anonymous_namespaces (const struct symbol *symbol) { @@ -76,10 +72,11 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol) while (name[next_component] == ':') { - if ((next_component - previous_component) == ANONYMOUS_NAMESPACE_LEN + if (((next_component - previous_component) + == CP_ANONYMOUS_NAMESPACE_LEN) && strncmp (name + previous_component, - "(anonymous namespace)", - ANONYMOUS_NAMESPACE_LEN) == 0) + CP_ANONYMOUS_NAMESPACE_STR, + CP_ANONYMOUS_NAMESPACE_LEN) == 0) { int dest_len = (previous_component == 0 ? 0 : previous_component - 2); @@ -207,7 +204,7 @@ cp_set_block_scope (const struct symbol *symbol, int cp_is_anonymous (const char *namespace) { - return (strstr (namespace, "(anonymous namespace)") + return (strstr (namespace, CP_ANONYMOUS_NAMESPACE_STR) != NULL); } |