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 c187e19f895f2f4b95402ee35a7b5fef6144c8e0..b31d16970cf477d3b84e3b2130b98ec3fec6bab4 100644 (file)
--- 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 21399e600e12a4cb579cea597f3f19870811e57e..10bacda2c8307564599a1cefbf070e815b7c9e86 100644 (file)
--- 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 16da04cb1f21cf9656f8929c1ff2b6438af62782..8213ae811adce22b70157007fed6dcbaf60bd7d1 100644 (file)
--- 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 f5c60d3c70e90c927146c7060e97c9f4b610c1e8..8f09b97a230204f802ba66e1ea2a17e3076d85bc 100644 (file)
--- 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.  */