From 0e714131c8bc3f42f9c552c259562f814066ec2e Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Sun, 8 Nov 1998 13:13:03 +0000 Subject: cplus-dem.c (demangle_template_value_parm): Use cplus_demangle, not internal_cplus_demangle. * cplus-dem.c (demangle_template_value_parm): Use cplus_demangle, not internal_cplus_demangle. From-SVN: r23570 --- libiberty/ChangeLog | 5 +++++ libiberty/cplus-dem.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'libiberty') diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 5bf2346..6f9e088 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +1998-11-08 Mark Mitchell + + * cplus-dem.c (demangle_template_value_parm): Use cplus_demangle, + not internal_cplus_demangle. + Sat Nov 7 16:02:10 1998 Kaveh R. Ghazi * choose-temp.c: Don't include gansidecl.h. diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index d4718d7..ebd00e1 100644 --- 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. */ -- cgit v1.1