class.c (layout_virtual_bases): Adjust names in conditionally compiled code.

	* class.c (layout_virtual_bases): Adjust names in conditionally
	compiled code.

From-SVN: r32680

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 18593169e7b70fb0b249df69ebd8777fb22f7d15..36dca353b803c931562215b77744948a08cc1c14 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-21  Mark Mitchell  <mark@codesourcery.com>
 
+       * class.c (layout_virtual_bases): Adjust names in conditionally
+       compiled code.
+       
        * class.c (record_base_offsets): New function.
        (layout_conflict_p): Likewise.
        (layout_nonempty_base_or_field): Use it.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 3298b7ad3ad076775d3fdcd124eed144656e16d4..12095ad95bd1c6b0104e9cda85a1b2b868b2ed50 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4827,8 +4827,8 @@ layout_virtual_bases (t, base_offsets)
 
 #ifdef STRUCTURE_SIZE_BOUNDARY
   /* Packed structures don't need to have minimum size.  */
-  if (! TYPE_PACKED (rec))
-    TYPE_ALIGN (rec) = MAX (TYPE_ALIGN (rec), STRUCTURE_SIZE_BOUNDARY);
+  if (! TYPE_PACKED (t))
+    TYPE_ALIGN (t) = MAX (TYPE_ALIGN (t), STRUCTURE_SIZE_BOUNDARY);
 #endif
 
   /* DSIZE is the size of the class without the virtual bases.  */