diff options
| author | Mark Mitchell <mmitchel@gcc.gnu.org> | 2007-01-11 15:42:27 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2007-01-11 15:42:27 +0000 |
| commit | 6311165e6da1b3c3df30bc65acf25b33c8e49120 (patch) | |
| tree | 760822f3798841b028d8b090cf489d01b8b82918 /gcc | |
| parent | 1aa6ca40fbf259b41619c8d9bac82f963b488160 (diff) | |
| download | gcc-6311165e6da1b3c3df30bc65acf25b33c8e49120.zip gcc-6311165e6da1b3c3df30bc65acf25b33c8e49120.tar.gz gcc-6311165e6da1b3c3df30bc65acf25b33c8e49120.tar.bz2 | |
Remove accidentally checked in hunk.
From-SVN: r120676
Diffstat (limited to 'gcc')
| -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 8183913..40009c2 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; |