From b72801e28a38c16cfc83c49af2ce54e8aa4b9e6f Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Tue, 20 Jun 2000 15:42:55 +0000 Subject: call.c (build_conditional_expr): Use VOID_TYPE_P. * call.c (build_conditional_expr): Use VOID_TYPE_P. * cvt.c (cp_convert_to_pointer): Likewise. (convert_to_void): Likewise. * error.c (dump_expr): Likewise. * except.c (complete_ptr_ref_or_void_ptr_p): Likewise. * init.c (build_delete): Likewise. * method.c (emit_thunk): Likewise. * optmize.c (declare_return_variable): Likewise. * rtti.c (get_tinfo_decl_dynamic): Likewise. (get_typeid): Likewise. (build_dynamic_cast_1): Likewise. * typeck.c (composite_pointer_type): Likewise. (common_type): Likewise. (build_indirect_ref): Likewise. (build_binary_op): Likewise. (build_x_compound_expr): Likewise. (check_return_expr): Likewise. * typeck2.c (add_exception_specifier): Likewise. * mangle.c (write_method_parms): Use direct comparison for end of parmlist. From-SVN: r34617 --- gcc/cp/method.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc/cp/method.c') diff --git a/gcc/cp/method.c b/gcc/cp/method.c index cdf27719bf6..1f09addec50 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -2271,10 +2271,10 @@ emit_thunk (thunk_fndecl) t = tree_cons (NULL_TREE, a, t); t = nreverse (t); t = build_call (function, t); - if (!same_type_p (TREE_TYPE (t), void_type_node)) - finish_return_stmt (t); - else + if (VOID_TYPE_P (TREE_TYPE (t))) finish_expr_stmt (t); + else + finish_return_stmt (t); /* The back-end expects DECL_INITIAL to contain a BLOCK, so we create one. */ -- cgit v1.2.1