merge from gcc

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

diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 4f8ae2cf63f5f9f0495d085a275212802dcf011c..8c0119ee8d5577347ffa78d115ee90f34d6ed42d 100644 (file)
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -1,5 +1,6 @@
 /* Helper routines for C++ support in GDB.
-   Copyright 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
    Namespace support contributed by David Carlton.
@@ -8,7 +9,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -17,9 +18,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef CP_SUPPORT_H
 #define CP_SUPPORT_H
@@ -97,15 +96,13 @@ 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,
@@ -116,10 +113,10 @@ extern void cp_check_possible_namespace_symbols (const char *name,
 
 struct type *cp_lookup_transparent_type (const char *name);
 
-/* Functions from cp-names.y.  */
+/* Functions from cp-name-parser.y.  */
 
 extern struct demangle_component *cp_demangled_name_to_comp
-  (const char *demangled_name, void **memory_p, const char **errmsg);
+  (const char *demangled_name, const char **errmsg);
 
 extern char *cp_comp_to_string (struct demangle_component *result,
                                int estimated_len);
@@ -128,10 +125,4 @@ extern char *cp_comp_to_string (struct demangle_component *result,
 
 extern struct cmd_list_element *maint_cplus_cmd_list;
 
-/* Pointer to member function.  Depends on compiler implementation.  */
-
-#define METHOD_PTR_IS_VIRTUAL(ADDR)  ((ADDR) & 0x80000000)
-#define METHOD_PTR_FROM_VOFFSET(OFFSET) (0x80000000 + (OFFSET))
-#define METHOD_PTR_TO_VOFFSET(ADDR) (~0x80000000 & (ADDR))
-
 #endif /* CP_SUPPORT_H */