From c3af729ad74e807c2364b33459373d4b8c70c287 Mon Sep 17 00:00:00 2001 From: Graham Stott Date: Wed, 9 Jan 2002 06:07:18 +0000 Subject: [PATCH] semantics.c (FINISH_COND): Uppercase macro paramaters and add parenthesis. * semantics.c (FINISH_COND): Uppercase macro paramaters and add parenthesis. From-SVN: r48674 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/semantics.c | 18 +++++++++--------- 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 + + * semantics.c (FINISH_COND): Uppercase macro paramaters and + add parenthesis. + 2002-01-08 Graham Stott * 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, -- 2.30.2