aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorDoug Evans <xdje42@gmail.com>2014-12-16 22:19:15 -0800
committerDoug Evans <xdje42@gmail.com>2014-12-16 22:19:15 -0800
commit55accf4a1eccd84436fc8238cb44021709472188 (patch)
tree661371333fce0b4da96499977abca36b5aadae7b /gdb
parenta07e3e182d1a00af9ce7bfc6b437f72fa84a2d8b (diff)
downloadgdb-55accf4a1eccd84436fc8238cb44021709472188.zip
gdb-55accf4a1eccd84436fc8238cb44021709472188.tar.gz
gdb-55accf4a1eccd84436fc8238cb44021709472188.tar.bz2
cp_lookup_symbol_via_imports: Renamed from cp_lookup_symbol_imports.
gdb/ChangeLog: * cp-namespace.c (cp_lookup_symbol_via_imports): Renamed from cp_lookup_symbol_imports. All callers updated.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/cp-namespace.c26
2 files changed, 18 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bf2fe6f..d9a8cfe 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2014-12-16 Doug Evans <xdje42@gmail.com>
+ * cp-namespace.c (cp_lookup_symbol_via_imports): Renamed from
+ cp_lookup_symbol_imports. All callers updated.
+
+2014-12-16 Doug Evans <xdje42@gmail.com>
+
* cp-namespace.c (cp_find_type_baseclass_by_name): Renamed from
find_type_baseclass_by_name. All callers updated.
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 3066737..06290a7 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -371,12 +371,12 @@ reset_directive_searched (void *data)
only the import of Y is considered. */
static struct symbol *
-cp_lookup_symbol_imports (const char *scope,
- const char *name,
- const struct block *block,
- const domain_enum domain,
- const int declaration_only,
- const int search_parents)
+cp_lookup_symbol_via_imports (const char *scope,
+ const char *name,
+ const struct block *block,
+ const domain_enum domain,
+ const int declaration_only,
+ const int search_parents)
{
struct using_direct *current;
struct symbol *sym = NULL;
@@ -472,9 +472,9 @@ cp_lookup_symbol_imports (const char *scope,
/* If this import statement creates no alias, pass
current->inner as NAMESPACE to direct the search
towards the imported namespace. */
- sym = cp_lookup_symbol_imports (current->import_src,
- name, block,
- domain, 0, 0);
+ sym = cp_lookup_symbol_via_imports (current->import_src,
+ name, block,
+ domain, 0, 0);
}
current->searched = 0;
discard_cleanups (searched_cleanup);
@@ -505,7 +505,7 @@ search_symbol_list (const char *name, int num,
return NULL;
}
-/* Like cp_lookup_symbol_imports, but if BLOCK is a function, it
+/* Like cp_lookup_symbol_via_imports, but if BLOCK is a function, it
searches through the template parameters of the function and the
function's type. */
@@ -578,7 +578,7 @@ cp_lookup_symbol_imports_or_template (const char *scope,
}
}
- return cp_lookup_symbol_imports (scope, name, block, domain, 1, 1);
+ return cp_lookup_symbol_via_imports (scope, name, block, domain, 1, 1);
}
/* Searches for NAME in the current namespace, and by applying
@@ -604,8 +604,8 @@ cp_lookup_symbol_namespace (const char *scope,
blocks. */
while (block != NULL)
{
- sym = cp_lookup_symbol_imports (scope, name, block,
- domain, 0, 1);
+ sym = cp_lookup_symbol_via_imports (scope, name, block,
+ domain, 0, 1);
if (sym)
return sym;