From aa1e6de60cceb2383b282eab8e2d88d07f542b81 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 1 Mar 2000 00:40:13 +0000 Subject: * init.c (construct_virtual_bases): Fix thinko. From-SVN: r32272 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/init.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8f4ddae..aab03ac 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2000-02-29 Jason Merrill + + * init.c (construct_virtual_bases): Fix thinko. + 2000-03-01 Martin von Loewis * decl.c (current_function_decl): Move to toplev.c. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 1f2eff4..b559054 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -801,7 +801,8 @@ construct_virtual_bases (type, this_ref, this_ptr, init_list, flag) exp = build (PLUS_EXPR, TREE_TYPE (this_ptr), this_ptr, - fold (build1 (NOP_EXPR, this_ptr, BINFO_OFFSET (vbases)))); + fold (build1 (NOP_EXPR, TREE_TYPE (this_ptr), + BINFO_OFFSET (vbases)))); exp = build1 (NOP_EXPR, build_pointer_type (BINFO_TYPE (vbases)), exp); -- cgit v1.1