diff options
author | Jason Merrill <jason@yorick.cygnus.com> | 1998-07-24 14:51:54 +0000 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 1998-07-24 10:51:54 -0400 |
commit | bc22fa9801c88bbf67efe464a378a8812d2e8ed6 (patch) | |
tree | f754c32ecaaf20666e387459a0096f007a5db269 /gcc | |
parent | d1fec18074669d313b92a54c9ea48e3c6f9f3cf3 (diff) | |
download | gcc-bc22fa9801c88bbf67efe464a378a8812d2e8ed6.zip gcc-bc22fa9801c88bbf67efe464a378a8812d2e8ed6.tar.gz gcc-bc22fa9801c88bbf67efe464a378a8812d2e8ed6.tar.bz2 |
* parse.y (nested_name_specifier_1): Pull out the TYPE_MAIN_VARIANT.
From-SVN: r21364
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
-rw-r--r-- | gcc/cp/parse.c | 2 | ||||
-rw-r--r-- | gcc/cp/parse.y | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7a479dd..127c8e9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c index 085e87b..04e517f 100644 --- a/gcc/cp/parse.c +++ b/gcc/cp/parse.c @@ -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: diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y index 2dab9f0..c5acf27 100644 --- a/gcc/cp/parse.y +++ b/gcc/cp/parse.y @@ -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 { |