diff options
| author | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-13 06:41:07 +0000 |
|---|---|---|
| committer | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-13 06:41:07 +0000 |
| commit | 4ee9c6840ad3fc92a9034343278a1e476ad6872a (patch) | |
| tree | a2568888a519c077427b133de9ece5879a8484a5 /gcc/cp/cvt.c | |
| parent | ebb338380ab170c91e64d38038e6b5ce930d69a1 (diff) | |
| download | gcc-4ee9c6840ad3fc92a9034343278a1e476ad6872a.tar.gz | |
Merge tree-ssa-20020619-branch into mainline.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81764 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index bf906fd969e..b22948106b2 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -810,7 +810,7 @@ convert_to_void (tree expr, const char *implicit) /* The second part of a compound expr contains the value. */ tree op1 = TREE_OPERAND (expr,1); tree new_op1 = convert_to_void - (op1, (implicit && !TREE_NO_UNUSED_WARNING (expr) + (op1, (implicit && !TREE_NO_WARNING (expr) ? "right-hand operand of comma" : NULL)); if (new_op1 != op1) @@ -887,7 +887,8 @@ convert_to_void (tree expr, const char *implicit) if (expr != error_mark_node && !VOID_TYPE_P (TREE_TYPE (expr))) { - if (implicit && !TREE_SIDE_EFFECTS (expr) && warn_unused_value) + if (implicit && warn_unused_value + && !TREE_SIDE_EFFECTS (expr) && !TREE_NO_WARNING (expr)) warning ("%s has no effect", implicit); expr = build1 (CONVERT_EXPR, void_type_node, expr); } |