semantics.c (FINISH_COND): Uppercase macro paramaters and add parenthesis.

        * semantics.c (FINISH_COND): Uppercase macro paramaters and
        add parenthesis.

From-SVN: r48674

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aca39d0e8532a0436d16fbebf3bdf4755c9257e4..0752983b3d18fa23539e7de409aed53197756492 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-09  Graham Stott  <grahams@redhat.com>
+
+       * semantics.c (FINISH_COND): Uppercase macro paramaters and
+       add parenthesis.
+
 2002-01-08  Graham Stott  <grahams@redhat.com>
 
        * xref.c (FILE_NAME_ABSOLUTE_P): Add parenthesis.

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index f17019cc8ee90e17bdcfa5522c8822ef9e8298e6..b8a09fd899ad0e19e98da57423bc0a7600ca1de8 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -66,19 +66,19 @@ static tree clear_decl_rtl PARAMS ((tree *, int *, void *));
 
 /* Finish processing the COND, the SUBSTMT condition for STMT.  */
 
-#define FINISH_COND(cond, stmt, substmt)               \
+#define FINISH_COND(COND, STMT, SUBSTMT)               \
   do {                                                 \
-    if (last_tree != stmt)                             \
+    if (last_tree != (STMT))                           \
       {                                                        \
-        RECHAIN_STMTS (stmt, substmt);                 \
-        if (!processing_template_decl)                  \
-          {                                             \
-           cond = build_tree_list (substmt, cond);     \
-           substmt = cond;                             \
-          }                                             \
+        RECHAIN_STMTS (STMT, SUBSTMT);                 \
+        if (!processing_template_decl)                 \
+          {                                            \
+           (COND) = build_tree_list (SUBSTMT, COND);   \
+           (SUBSTMT) = (COND);                         \
+          }                                            \
       }                                                        \
     else                                               \
-      substmt = cond;                                  \
+      (SUBSTMT) = (COND);                              \
   } while (0)
 
 /* Returns non-zero if the current statement is a full expression,