cfgexpand.c (avoid_complex_debug_insns): Fix C++ism.

* cfgexpand.c (avoid_complex_debug_insns): Fix C++ism.
cp/
	* parser.c (cp_parser_late_return_type_opt): Likewise.

From-SVN: r198114
This commit is contained in:
Eric Botcazou 2013-04-21 08:02:06 +00:00 committed by Eric Botcazou
parent 970e6639ea
commit 111d7531cc
4 changed files with 14 additions and 5 deletions

View File

@ -1,3 +1,7 @@
2013-04-21 Eric Botcazou <ebotcazou@adacore.com>
* cfgexpand.c (avoid_complex_debug_insns): Fix C++ism.
2013-04-19 Matthias Klose <doko@ubuntu.com>
PR middle-end/56848

View File

@ -3646,6 +3646,8 @@ static void
avoid_complex_debug_insns (rtx insn, rtx *exp_p, int depth)
{
rtx exp = *exp_p;
const char *format_ptr;
int i, j;
if (exp == NULL_RTX)
return;
@ -3668,8 +3670,7 @@ avoid_complex_debug_insns (rtx insn, rtx *exp_p, int depth)
return;
}
const char *format_ptr = GET_RTX_FORMAT (GET_CODE (exp));
int i, j;
format_ptr = GET_RTX_FORMAT (GET_CODE (exp));
for (i = 0; i < GET_RTX_LENGTH (GET_CODE (exp)); i++)
switch (*format_ptr++)
{

View File

@ -1,3 +1,7 @@
2013-04-21 Eric Botcazou <ebotcazou@adacore.com>
* parser.c (cp_parser_late_return_type_opt): Fix C++ism.
2013-04-15 Jason Merrill <jason@redhat.com>
PR c++/56388

View File

@ -16691,7 +16691,7 @@ static tree
cp_parser_late_return_type_opt (cp_parser* parser, cp_cv_quals quals)
{
cp_token *token;
tree type;
tree type, save_ccp, save_ccr;
/* Peek at the next token. */
token = cp_lexer_peek_token (parser->lexer);
@ -16702,8 +16702,8 @@ cp_parser_late_return_type_opt (cp_parser* parser, cp_cv_quals quals)
/* Consume the ->. */
cp_lexer_consume_token (parser->lexer);
tree save_ccp = current_class_ptr;
tree save_ccr = current_class_ref;
save_ccp = current_class_ptr;
save_ccr = current_class_ref;
if (quals >= 0)
{
/* DR 1207: 'this' is in scope in the trailing return type. */