[4.7] Fix a couple of C++isms

[Eric Botcazou]

Bootstrapped/regtested on x86_64-suse-linux, applied as obvious.


2013-04-21  Eric Botcazou  <ebotca...@adacore.com>

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


-- 
Eric Botcazou
Index: cp/parser.c
===================================================================
--- cp/parser.c	(revision 198109)
+++ cp/parser.c	(working copy)
@@ -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_parse
   /* 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.  */
Index: cfgexpand.c
===================================================================
--- cfgexpand.c	(revision 198109)
+++ cfgexpand.c	(working copy)
@@ -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
       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++)
       {