aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/parser.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dcd0d3f..80c24dd 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01 Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+ * parser.c (cp_parser_declaration): Set token2.type to CPP_EOF,
+ not RID_MAX.
+
2005-11-30 Jason Merrill <jason@redhat.com>
PR c++/21123
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 0ea0f93..daec37d 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -6914,7 +6914,10 @@ cp_parser_declaration (cp_parser* parser)
if (token1.type != CPP_EOF)
token2 = *cp_lexer_peek_nth_token (parser->lexer, 2);
else
- token2.type = token2.keyword = RID_MAX;
+ {
+ token2.type = CPP_EOF;
+ token2.keyword = RID_MAX;
+ }
/* Get the high-water mark for the DECLARATOR_OBSTACK. */
p = obstack_alloc (&declarator_obstack, 0);