From b7a290122f69b91951a58140fb319e0f68049218 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 23 Jan 1998 22:04:11 -0500 Subject: [PATCH] tweak From-SVN: r17469 --- gcc/cp/class.c | 3 +-- gcc/cp/error.c | 16 ++++++++++------ gcc/cp/pt.c | 5 ++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gcc/cp/class.c b/gcc/cp/class.c index d2cb7ae3cd4..4ed1656b024 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4499,8 +4499,7 @@ finish_struct (t, list_of_fieldlists, attributes, warn_anon) TYPE_BEING_DEFINED (t) = 0; - /* Now, figure out what any member template specializations were - specializing. */ + /* Now, figure out which member templates we're specializing. */ for (x = specializations; x != NULL_TREE; x = TREE_CHAIN (x)) { tree spec_args; diff --git a/gcc/cp/error.c b/gcc/cp/error.c index f6acd4b0c24..2cc5c84d765 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -250,11 +250,13 @@ dump_type (t, v) arg = TREE_VALUE (arg); if (TREE_CODE (arg) == TYPE_DECL) { - OB_PUTS ("class "); if (DECL_NAME (arg)) - OB_PUTID (DECL_NAME (arg)); + { + OB_PUTS ("class "); + OB_PUTID (DECL_NAME (arg)); + } else - OB_PUTS ("{anon}"); + OB_PUTS ("class"); } else dump_decl (arg, 1); @@ -821,11 +823,13 @@ dump_decl (t, v) arg = TREE_VALUE (arg); if (TREE_CODE (arg) == TYPE_DECL) { - OB_PUTS ("class "); if (DECL_NAME (arg)) - OB_PUTID (DECL_NAME (arg)); + { + OB_PUTS ("class "); + OB_PUTID (DECL_NAME (arg)); + } else - OB_PUTS ("{anon}"); + OB_PUTS ("class"); } else dump_decl (arg, 1); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4e631ca2256..7f32c4f7903 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3077,9 +3077,8 @@ tsubst (t, args, nargs, in_decl) { /* We are processing a type constructed from a template template parameter */ - tree argvec = tsubst ( - TREE_VALUE (CLASSTYPE_TEMPLATE_INFO (t)), - args, nargs, in_decl); + tree argvec = tsubst (CLASSTYPE_TI_ARGS (t), + args, nargs, in_decl); tree r; /* We can get a TEMPLATE_TEMPLATE_PARM here when -- 2.30.2