From dd94dde78316a27e0028759abbca126fb0fd037f Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 3 Mar 2012 19:55:38 -0500 Subject: mangle.c (write_nested_name): Use decl_mangling_context. * mangle.c (write_nested_name): Use decl_mangling_context. (write_prefix, write_template_prefix): Likewise. From-SVN: r184875 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/mangle.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index af3434d..df39779 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2012-03-03 Jason Merrill + * mangle.c (write_nested_name): Use decl_mangling_context. + (write_prefix, write_template_prefix): Likewise. + PR c++/36797 * mangle.c (write_expression): Improve diagnostic for TRAIT_EXPR. diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 04f4344..1379e3b 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -942,7 +942,7 @@ write_nested_name (const tree decl) } else { - write_prefix (CP_DECL_CONTEXT (decl)); + write_prefix (decl_mangling_context (decl)); write_unqualified_name (decl); } } @@ -1030,7 +1030,7 @@ write_prefix (const tree node) } else { - write_prefix (CP_DECL_CONTEXT (decl)); + write_prefix (decl_mangling_context (decl)); write_unqualified_name (decl); } } @@ -1060,7 +1060,7 @@ write_template_prefix (const tree node) { tree decl = DECL_P (node) ? node : TYPE_NAME (node); tree type = DECL_P (node) ? TREE_TYPE (node) : node; - tree context = CP_DECL_CONTEXT (decl); + tree context = decl_mangling_context (decl); tree template_info; tree templ; tree substitution; -- cgit v1.1