Merge GDB 7.5.1

gdb/cp-support.h

 /* Helper routines for C++ support in GDB.
    Copyright (C) 2002-2005, 2007-2012 Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
    Namespace support contributed by David Carlton.
 
    This file is part of GDB.
 
    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 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef CP_SUPPORT_H
 #define CP_SUPPORT_H
 
 /* We need this for 'domain_enum', alas...  */
 
 #include "symtab.h"
 #include "vec.h"
+#include "gdb_vecs.h"
 #include "gdb_obstack.h"
 
 /* Opaque declarations.  */
 
 struct symbol;
 struct block;
 struct objfile;
 struct type;
 struct demangle_component;
 
@@ skipping 124 matching lines @@
 extern struct symbol **make_symbol_overload_list (const char *,
                                                   const char *);
 
 extern struct symbol **make_symbol_overload_list_adl (struct type **arg_types,
                                                       int nargs,
                                                       const char *func_name);
 
 extern struct type *cp_lookup_rtti_type (const char *name,
                                          struct block *block);
 
-extern int cp_validate_operator (const char *input);
-
 /* Functions/variables from cp-namespace.c.  */
 
 extern int cp_is_anonymous (const char *namespace);
 
-DEF_VEC_P (const_char_ptr);
-
 extern void cp_add_using_directive (const char *dest,
                                     const char *src,
                                     const char *alias,
                                     const char *declaration,
                                     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,
                                 const char *processing_current_prefix,
                                 int processing_has_namespace_info);
 
 extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol,
                                               struct objfile *objfile);
 
 extern struct symbol *cp_lookup_symbol_nonlocal (const char *name,
@@ skipping 11 matching lines @@
                                                 const domain_enum domain,
                                                 const int declaration_only,
                                                 const int search_parents);
 
 extern struct symbol *cp_lookup_symbol_imports_or_template
      (const char *scope,
       const char *name,
       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);
 
 /* Functions from cp-name-parser.y.  */
 
 extern struct demangle_parse_info *cp_demangled_name_to_comp
      (const char *demangled_name, const char **errmsg);
 
 extern char *cp_comp_to_string (struct demangle_component *result,
                                 int estimated_len);
 
 extern void cp_demangled_name_parse_free (struct demangle_parse_info *);
 extern struct cleanup *make_cleanup_cp_demangled_name_parse_free
      (struct demangle_parse_info *);
 extern void cp_merge_demangle_parse_infos (struct demangle_parse_info *,
                                            struct demangle_component *,
                                            struct demangle_parse_info *);
 
 extern struct demangle_parse_info *cp_new_demangle_parse_info (void);
 
 /* The list of "maint cplus" commands.  */
 
 extern struct cmd_list_element *maint_cplus_cmd_list;
 
 #endif /* CP_SUPPORT_H */