diff options
| author | Jason Merrill <jason@casey.cygnus.com> | 2000-03-01 00:40:13 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-02-29 19:40:13 -0500 |
| commit | aa1e6de60cceb2383b282eab8e2d88d07f542b81 (patch) | |
| tree | 8a75990d94ca3d4beee6545a7dd3102dd2e176cf /gcc | |
| parent | bad8ed14a48b58f3b29e7d88a4a3ae1c5af7906e (diff) | |
| download | gcc-aa1e6de60cceb2383b282eab8e2d88d07f542b81.zip gcc-aa1e6de60cceb2383b282eab8e2d88d07f542b81.tar.gz gcc-aa1e6de60cceb2383b282eab8e2d88d07f542b81.tar.bz2 | |
* init.c (construct_virtual_bases): Fix thinko.
From-SVN: r32272
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/init.c | 3 |
2 files changed, 6 insertions, 1 deletions
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 <jason@casey.cygnus.com> + + * init.c (construct_virtual_bases): Fix thinko. + 2000-03-01 Martin von Loewis <loewis@informatik.hu-berlin.de> * 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); |