Commit bc22fa98 by Jason Merrill Committed by Jason Merrill

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

From-SVN: r21364
parent d1fec180
1998-07-24 Jason Merrill <jason@yorick.cygnus.com> 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. * pt.c (coerce_template_parms): Also complain about local enums.
* cp-tree.h: Add prototype for set_identifier_local_value. * cp-tree.h: Add prototype for set_identifier_local_value.
......
...@@ -6796,7 +6796,7 @@ case 623: ...@@ -6796,7 +6796,7 @@ case 623:
&& ! IDENTIFIER_CLASS_VALUE (yyvsp[-1].ttype)) && ! IDENTIFIER_CLASS_VALUE (yyvsp[-1].ttype))
pushdecl_class_level (yyval.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;} break;}
case 624: case 624:
......
...@@ -2897,7 +2897,7 @@ nested_name_specifier_1: ...@@ -2897,7 +2897,7 @@ nested_name_specifier_1:
&& ! IDENTIFIER_CLASS_VALUE ($1)) && ! IDENTIFIER_CLASS_VALUE ($1))
pushdecl_class_level ($$); pushdecl_class_level ($$);
} }
got_scope = $$ = TREE_TYPE ($$); got_scope = $$ = TYPE_MAIN_VARIANT (TREE_TYPE ($$));
} }
| SELFNAME SCOPE | SELFNAME SCOPE
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment