Skip to content

R
riscv-gcc-1
Commit 6311165e by Mark Mitchell
Options

Remove accidentally checked in hunk. 

From-SVN: r120676
parent 1aa6ca40
Showing with 0 additions and 2 deletions
gcc/cp/parser.c
...@@ -6093,7 +6093,6 @@ cp_parser_constant_expression (cp_parser* parser, ...@@ -6093,7 +6093,6 @@ cp_parser_constant_expression (cp_parser* parser,
parser->integral_constant_expression_p = true; parser->integral_constant_expression_p = true;
parser->allow_non_integral_constant_expression_p = allow_non_constant_p; parser->allow_non_integral_constant_expression_p = allow_non_constant_p;
parser->non_integral_constant_expression_p = false; parser->non_integral_constant_expression_p = false;
integral_constant_expr_p = true;
/* Although the grammar says "conditional-expression", we parse an /* Although the grammar says "conditional-expression", we parse an
"assignment-expression", which also permits "throw-expression" "assignment-expression", which also permits "throw-expression"
and the use of assignment operators. In the case that and the use of assignment operators. In the case that
...@@ -6105,7 +6104,6 @@ cp_parser_constant_expression (cp_parser* parser, ...@@ -6105,7 +6104,6 @@ cp_parser_constant_expression (cp_parser* parser,
constant. */ constant. */
expression = cp_parser_assignment_expression (parser, /*cast_p=*/false); expression = cp_parser_assignment_expression (parser, /*cast_p=*/false);
/* Restore the old settings. */ /* Restore the old settings. */
integral_constant_expr_p = false;
parser->integral_constant_expression_p parser->integral_constant_expression_p
= saved_integral_constant_expression_p; = saved_integral_constant_expression_p;
parser->allow_non_integral_constant_expression_p parser->allow_non_integral_constant_expression_p
......
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