diff options
| author | Andrew Macleod <amacleod@redhat.com> | 2016-05-10 03:30:56 +0000 |
|---|---|---|
| committer | Andrew Macleod <amacleod@redhat.com> | 2016-05-10 03:30:56 +0000 |
| commit | 357ceb7fe26970b6c6e12f0bb2ceecab6c6a2454 (patch) | |
| tree | 48eb1f57289f4e995f069f38213ad5c8a16f0347 /gcc/cp/parser.c | |
| parent | 5ed230ef2005822d6402118e58a311db2a9cb0c7 (diff) | |
| parent | 8a50780e586342528692744150d08651fb07fb43 (diff) | |
update to 2016-05-09ttype-2016-05-03
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ttype-2016-05-03@236057 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/parser.c')
| -rw-r--r-- | gcc/cp/parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index c4941a05996..f4c6f74b3d0 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -10951,7 +10951,7 @@ cp_parser_selection_statement (cp_parser* parser, bool *if_p, statement which does have an else clause. We warn about the potential ambiguity. */ if (nested_if) - warning_at (EXPR_LOCATION (statement), OPT_Wparentheses, + warning_at (EXPR_LOCATION (statement), OPT_Wdangling_else, "suggest explicit braces to avoid ambiguous" " %<else%>"); if (warn_duplicated_cond) @@ -10978,7 +10978,7 @@ cp_parser_selection_statement (cp_parser* parser, bool *if_p, in_statement = parser->in_statement; parser->in_switch_statement_p = true; parser->in_statement |= IN_SWITCH_STMT; - cp_parser_implicitly_scoped_statement (parser, NULL, + cp_parser_implicitly_scoped_statement (parser, if_p, guard_tinfo); parser->in_switch_statement_p = in_switch_statement_p; parser->in_statement = in_statement; |