2009-12-23 Dmitry Gorbachev <d.g.gorbachev@gmail.com>

[pf3gnuchains/pf3gnuchains3x.git] / gdb / cp-support.h

diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index f52154b..7ecd201 100644 (file)
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -1,5 +1,5 @@
 /* Helper routines for C++ support in GDB.
-   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
@@ -37,15 +37,15 @@ struct type;
 struct demangle_component;
 
 /* This struct is designed to store data from using directives.  It
-   says that names from namespace INNER should be visible within
-   namespace OUTER.  OUTER should always be a strict initial substring
-   of INNER.  These form a linked list; NEXT is the next element of
-   the list.  */
+   says that names from namespace IMPORT_SRC should be visible within
+   namespace IMPORT_DEST. IMPORT_DEST should always be a strict initial
+   substring of IMPORT_SRC. These form a linked list; NEXT is the next element
+   of the list.  */
 
 struct using_direct
 {
-  char *inner;
-  char *outer;
+  char *import_src;
+  char *import_dest;
   struct using_direct *next;
 };
 
@@ -64,23 +64,26 @@ extern unsigned int cp_entire_prefix_len (const char *name);
 
 extern char *cp_func_name (const char *full_name);
 
+extern char *cp_remove_params (const char *demangled_name);
+
 extern struct symbol **make_symbol_overload_list (const char *,
                                                  const char *);
 
 extern struct type *cp_lookup_rtti_type (const char *name,
                                         struct block *block);
 
-/* Functions/variables from cp-namespace.c.  */
-
-extern unsigned char processing_has_namespace_info;
+extern int cp_validate_operator (const char *input);
 
-extern const char *processing_current_prefix;
+/* Functions/variables from cp-namespace.c.  */
 
 extern int cp_is_anonymous (const char *namespace);
 
-extern void cp_add_using_directive (const char *name,
-                                   unsigned int outer_length,
-                                   unsigned int inner_length);
+extern void cp_add_using_directive (const char *dest,
+                                    const char *src);
+
+extern struct using_direct *cp_add_using (const char *dest,
+                                          const char *src,
+                                         struct using_direct *next);
 
 extern void cp_initialize_namespace (void);
 
@@ -89,22 +92,22 @@ extern void cp_finalize_namespace (struct block *static_block,
 
 extern void cp_set_block_scope (const struct symbol *symbol,
                                struct block *block,
-                               struct obstack *obstack);
+                               struct obstack *obstack,
+                               const char *processing_current_prefix,
+                               int processing_has_namespace_info);
 
 extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol);
 
 extern struct symbol *cp_lookup_symbol_nonlocal (const char *name,
                                                 const char *linkage_name,
                                                 const struct block *block,
-                                                const domain_enum domain,
-                                                struct symtab **symtab);
+                                                const domain_enum domain);
 
 extern struct symbol *cp_lookup_symbol_namespace (const char *namespace,
                                                  const char *name,
                                                  const char *linkage_name,
                                                  const struct block *block,
-                                                 const domain_enum domain,
-                                                 struct symtab **symtab);
+                                                 const domain_enum domain);
 
 extern struct type *cp_lookup_nested_type (struct type *parent_type,
                                           const char *nested_name,