diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-11 15:42:27 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-11 15:42:27 +0000 |
| commit | 6fa283db8f50c6d0664ebcc26bbec3638707a06a (patch) | |
| tree | 760822f3798841b028d8b090cf489d01b8b82918 | |
| parent | 77258a2e3d6842da85b7c283339c621fcf9f7cca (diff) | |
| download | ppe42-gcc-6fa283db8f50c6d0664ebcc26bbec3638707a06a.tar.gz ppe42-gcc-6fa283db8f50c6d0664ebcc26bbec3638707a06a.zip | |
Remove accidentally checked in hunk.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120676 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/parser.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 8183913f47c..40009c218bf 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -6093,7 +6093,6 @@ cp_parser_constant_expression (cp_parser* parser, parser->integral_constant_expression_p = true; parser->allow_non_integral_constant_expression_p = allow_non_constant_p; parser->non_integral_constant_expression_p = false; - integral_constant_expr_p = true; /* Although the grammar says "conditional-expression", we parse an "assignment-expression", which also permits "throw-expression" and the use of assignment operators. In the case that @@ -6105,7 +6104,6 @@ cp_parser_constant_expression (cp_parser* parser, constant. */ expression = cp_parser_assignment_expression (parser, /*cast_p=*/false); /* Restore the old settings. */ - integral_constant_expr_p = false; parser->integral_constant_expression_p = saved_integral_constant_expression_p; parser->allow_non_integral_constant_expression_p @@ -10313,8 +10311,8 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, /*check_dependency_p=*/true, /*type_p=*/true, is_declaration); - /* For everything but enumeration types, consider a template-id. - For an enumeration type, consider only a plain identifier. */ + /* For everything but enumeration types, consider a template-id. + For an enumeration type, consider only a plain identifier. */ if (tag_type != enum_type) { bool template_p = false; |
