diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-11-15 15:09:43 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-11-15 15:09:43 +0000 |
| commit | 69773da096e870da618abe3d70a75faadcae9d7e (patch) | |
| tree | 3a2e64bbd40a3c54769c05fc7a160ad65a8d29fc /gcc/cp/cvt.c | |
| parent | 86dad700a77dcaa54960a756ddad2ae2e187f007 (diff) | |
| download | ppe42-gcc-69773da096e870da618abe3d70a75faadcae9d7e.tar.gz ppe42-gcc-69773da096e870da618abe3d70a75faadcae9d7e.zip | |
* parse.y: Add ... IDENTIFIER SCOPE and ... PTYPENAME SCOPE expansions.
* decl.c (make_typename_type): Handle getting a class template.
* search.c (lookup_field_r): A class template is good enough for
want_type.
* call.c (convert_like_real): Only use cp_convert for the bad part.
(standard_conversion): Also allow bad int->enum.
* typeck.c (ptr_reasonably_similar): Also allow functions to
interconvert. Pointers to same-size integers are reasonably
similar.
* cvt.c (convert_to_void): If we build a new COND_EXPR, always
give it void type.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47060 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 81d05777308..960552c8e6a 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -936,10 +936,8 @@ convert_to_void (expr, implicit) tree new_op1 = convert_to_void (op1, implicit); tree new_op2 = convert_to_void (op2, implicit); - if (new_op1 != op1 || new_op2 != op2) - expr = build (COND_EXPR, - implicit ? TREE_TYPE (expr) : void_type_node, - TREE_OPERAND (expr, 0), new_op1, new_op2); + expr = build (COND_EXPR, void_type_node, + TREE_OPERAND (expr, 0), new_op1, new_op2); break; } |
