From 69773da096e870da618abe3d70a75faadcae9d7e Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 15 Nov 2001 15:09:43 +0000 Subject: * 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 --- gcc/cp/cvt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gcc/cp/cvt.c') 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; } -- cgit v1.2.1