tweak

From-SVN: r17469

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;

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);

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