daily update

[deliverable/binutils-gdb.git] / gdb / cp-support.h

diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 9c150f801594480fd4a2dc420fc3d3605bafcff9..86ccd5ecea1d84dd01b823786f9aae7e431b9a62 100644 (file)
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -149,6 +149,12 @@ extern char *cp_canonicalize_string (const char *string);
 
 extern char *cp_canonicalize_string_no_typedefs (const char *string);
 
+typedef const char *(canonicalization_ftype) (struct type *, void *);
+
+extern char *cp_canonicalize_string_full (const char *string,
+                                         canonicalization_ftype *finder,
+                                         void *data);
+
 extern char *cp_class_name_from_physname (const char *physname);
 
 extern char *method_name_from_physname (const char *physname);
@@ -213,9 +219,9 @@ extern struct symbol *cp_lookup_symbol_imports_or_template
       const struct block *block,
       const domain_enum domain);
 
-extern struct type *cp_lookup_nested_type (struct type *parent_type,
-                                          const char *nested_name,
-                                          const struct block *block);
+extern struct symbol *cp_lookup_nested_symbol (struct type *parent_type,
+                                              const char *nested_name,
+                                              const struct block *block);
 
 struct type *cp_lookup_transparent_type (const char *name);