summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrahams <grahams@138bc75d-0d04-0410-961f-82ee72b054a4>2002-01-09 06:07:18 +0000
committergrahams <grahams@138bc75d-0d04-0410-961f-82ee72b054a4>2002-01-09 06:07:18 +0000
commit689fdaa17b2f6e4bf0fb1f6713d10eef115c715b (patch)
treed9e8abf933cd6ad2e7fcec68fc8c89ddbc46d101
parenta518236dcc2c2487f9df50c42a757610fa5088a2 (diff)
downloadgcc-689fdaa17b2f6e4bf0fb1f6713d10eef115c715b.tar.gz
* semantics.c (FINISH_COND): Uppercase macro paramaters and
add parenthesis. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48674 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/semantics.c18
2 files changed, 14 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aca39d0e853..0752983b3d1 100644
--- 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 f17019cc8ee..b8a09fd899a 100644
--- 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,