cplus-dem.c (demangle_template_value_parm): Use cplus_demangle, not internal_cplus_de...

	* cplus-dem.c (demangle_template_value_parm): Use cplus_demangle,
	not internal_cplus_demangle.

From-SVN: r23570

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5bf23463ada1db65491881ab6538df8b18fa88b4..6f9e08872e28f7d8e8d49b56e3f87c403349e287 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-08  Mark Mitchell  <mark@markmitchell.com>
+
+       * cplus-dem.c (demangle_template_value_parm): Use cplus_demangle,
+       not internal_cplus_demangle.
+
 Sat Nov  7 16:02:10 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * choose-temp.c: Don't include gansidecl.h.

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index d4718d780a2db6d2691e656c821a09e255ad7002..ebd00e19508e559cc7eef6f3db7e1836aa2e0479 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -1436,7 +1436,12 @@ demangle_template_value_parm (work, mangled, s, tk)
          char *p = xmalloc (symbol_len + 1), *q;
          strncpy (p, *mangled, symbol_len);
          p [symbol_len] = '\0';
-         q = internal_cplus_demangle (work, p);
+         /* We use cplus_demangle here, rather than
+            internal_cplus_demangle, because the name of the entity
+            mangled here does not make use of any of the squangling
+            or type-code information we have built up thus far; it is
+            mangled independently.  */
+         q = cplus_demangle (p, work->options);
          string_appendn (s, "&", 1);
          /* FIXME: Pointer-to-member constants should get a
                    qualifying class name here.  */