From: Eric Botcazou <ebotcazou@adacore.com>
Date: Sun, 21 Apr 2013 08:02:06 +0000 (+0000)
Subject: cfgexpand.c (avoid_complex_debug_insns): Fix C++ism.
X-Git-Tag: releases/gcc-4.7.4~704
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=111d7531cce38a21b8b9cb0c338221ec9d2f2705;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c187e19f895f..b31d16970cf4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 21399e600e12..10bacda2c830 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -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++)
       {
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 16da04cb1f21..8213ae811adc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index f5c60d3c70e9..8f09b97a2302 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -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.  */