X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-support.h;h=c22c1e7ff0a7d763fbc710d5655e84e69cd5785d;hb=e2a3e0f1059915b0fb14dded53c5fe584714c22a;hp=03ccb733cbb241fa51538792ead98a2d5d732126;hpb=111dfaae0479f43eab9f3411c90ee03104a2be2d;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 03ccb733cb..c22c1e7ff0 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -1,5 +1,5 @@
 /* Helper routines for C++ support in GDB.
-   Copyright (C) 2002-2005, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
    Namespace support contributed by David Carlton.
@@ -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);
@@ -182,11 +188,6 @@ extern void cp_add_using_directive (const char *dest,
 				    VEC (const_char_ptr) *excludes,
                                     struct obstack *obstack);
 
-extern void cp_initialize_namespace (void);
-
-extern void cp_finalize_namespace (struct block *static_block,
-				   struct obstack *obstack);
-
 extern void cp_set_block_scope (const struct symbol *symbol,
 				struct block *block,
 				struct obstack *obstack,
@@ -218,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);