* init.c (construct_virtual_bases): Fix thinko.

From-SVN: r32272

* init.c (construct_virtual_bases): Fix thinko.
From-SVN: r32272
aa1e6de6 · Jason Merrill · Jason Merrill · bad8ed14 · aa1e6de6 · aa1e6de6
Commit aa1e6de6 authored Mar 01, 2000 by Jason Merrill Committed by Jason Merrill Feb 29, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

gcc/cp/ChangeLog
+4 -0

gcc/cp/init.c
+2 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+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.

--- 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);