[SCM] archer-sergiodj-cpp-template-lookup: Fixing some compilation errors on patch #1.

[SCM] archer-sergiodj-cpp-template-lookup: Fixing some compilation errors on patch #1.

[sergiodj]

The branch, archer-sergiodj-cpp-template-lookup has been updated
       via  6436c52bbd3d7ccd54e67138dd7cee92cb371966 (commit)
      from  656062dbd8105c467acfa7434f1c8a58d8afe94d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 6436c52bbd3d7ccd54e67138dd7cee92cb371966
Author: Sergio Durigan Junior <sergiodj@redhat.com>
Date:   Tue May 22 14:44:03 2012 -0300

    Fixing some compilation errors on patch #1.

-----------------------------------------------------------------------

Summary of changes:
 gdb/cp-support.c |    7 ++++---
 gdb/symtab.c     |    2 +-
 gdb/symtab.h     |    2 --
 3 files changed, 5 insertions(+), 6 deletions(-)

First 500 lines of diff:
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 467e9ab..b73cfbd 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -883,7 +883,7 @@ cp_remove_template_params_component (struct demangle_component *comp)
 char *
 cp_remove_template_params (const char *name)
 {
-  struct demangle_component *ret_comp;
+  struct demangle_parse_info *ret_comp;
   char *ret = NULL;
 
   if (name == NULL)
@@ -893,8 +893,9 @@ cp_remove_template_params (const char *name)
   if (ret_comp == NULL)
     return NULL;
 
-  ret_comp = cp_remove_template_params_component (ret_comp);
-  ret = cp_comp_to_string (ret_comp, 10);
+  ret_comp->tree = cp_remove_template_params_component (ret_comp->tree);
+  ret = cp_comp_to_string (ret_comp->tree, 10);
+  cp_demangled_name_parse_free (ret_comp);
 
   return ret;
 }
diff --git a/gdb/symtab.c b/gdb/symtab.c
index b5ef6fc..a501a59 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -505,7 +505,7 @@ symbol_set_cplus_search_name (struct general_symbol_info *gsymbol,
 
 /* Get the search name of the give GSYMBOL.  */
 
-char*
+static const char *
 symbol_get_cplus_search_name (const struct general_symbol_info *gsymbol)
 {
   if (gsymbol->language_specific.cplus_specific != NULL
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 9888025..37cfd71 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -176,8 +176,6 @@ extern void symbol_set_cplus_search_name (struct general_symbol_info *gsymbol,
 					  struct objfile *objfile,
 					  const char *name);
 
-extern char* symbol_get_cplus_search_name (const struct general_symbol_info *);
-
 extern CORE_ADDR symbol_overlayed_address (CORE_ADDR, struct obj_section *);
 
 /* Note that all the following SYMBOL_* macros are used with the


hooks/post-receive
--
Repository for Project Archer.