* parse.y (nested_name_specifier_1): Pull out the TYPE_MAIN_VARIANT.

From-SVN: r21364
This commit is contained in:
Jason Merrill 1998-07-24 14:51:54 +00:00 committed by Jason Merrill
parent d1fec18074
commit bc22fa9801
3 changed files with 4 additions and 2 deletions

View File

@ -1,5 +1,7 @@
1998-07-24 Jason Merrill <jason@yorick.cygnus.com>
* parse.y (nested_name_specifier_1): Pull out the TYPE_MAIN_VARIANT.
* pt.c (coerce_template_parms): Also complain about local enums.
* cp-tree.h: Add prototype for set_identifier_local_value.

View File

@ -6796,7 +6796,7 @@ case 623:
&& ! IDENTIFIER_CLASS_VALUE (yyvsp[-1].ttype))
pushdecl_class_level (yyval.ttype);
}
got_scope = yyval.ttype = TREE_TYPE (yyval.ttype);
got_scope = yyval.ttype = TYPE_MAIN_VARIANT (TREE_TYPE (yyval.ttype));
;
break;}
case 624:

View File

@ -2897,7 +2897,7 @@ nested_name_specifier_1:
&& ! IDENTIFIER_CLASS_VALUE ($1))
pushdecl_class_level ($$);
}
got_scope = $$ = TREE_TYPE ($$);
got_scope = $$ = TYPE_MAIN_VARIANT (TREE_TYPE ($$));
}
| SELFNAME SCOPE
{