Merge GDB 7.5.1

gdb/cp-support.h

Index: gdb/cp-support.h
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 8898807bfa769e8af386156a683fb481efb77228..0d2b5131b549eae2e006096d198b4fdd0a495568 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -26,6 +26,7 @@
 
 #include "symtab.h"
 #include "vec.h"
+#include "gdb_vecs.h"
 #include "gdb_obstack.h"
 
 /* Opaque declarations.  */
@@ -170,14 +171,10 @@ extern struct symbol **make_symbol_overload_list_adl (struct type **arg_types,
 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,
@@ -185,11 +182,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,
@@ -221,9 +213,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);