diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2002-04-24 22:46:40 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-04-24 22:46:40 +0000 |
| commit | a62d375fda94a2dcbb05f00037d320e04cb02d4a (patch) | |
| tree | a0e5dd2a59894828a383c713f72cfa02f78c2a79 /gcc/cp | |
| parent | 3fac72c72982c491a4f0081196fb187e3d20cca2 (diff) | |
| download | gcc-a62d375fda94a2dcbb05f00037d320e04cb02d4a.zip gcc-a62d375fda94a2dcbb05f00037d320e04cb02d4a.tar.gz gcc-a62d375fda94a2dcbb05f00037d320e04cb02d4a.tar.bz2 | |
cvt.c (convert_to_void): Don't unconditionally make COND_EXPRs void.
* cvt.c (convert_to_void): Don't unconditionally make COND_EXPRs
void.
From-SVN: r52742
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 39b60eb..e4ca059 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2002-04-24 Mark Mitchell <mark@codesourcery.com> + + PR c++/6438. + * cvt.c (convert_to_void): Don't unconditionally make COND_EXPRs + void. + 2002-04-24 Neil Booth <neil@daikokuya.demon.co.uk> * cp-lang.c (LANG_HOOKS_COMMON_ATTRIBUTE_TABLE, diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index d0f9945..b5306c1 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -836,7 +836,7 @@ convert_to_void (expr, implicit) tree new_op1 = convert_to_void (op1, implicit); tree new_op2 = convert_to_void (op2, implicit); - expr = build (COND_EXPR, void_type_node, + expr = build (COND_EXPR, TREE_TYPE (new_op1), TREE_OPERAND (expr, 0), new_op1, new_op2); break; } |