From 736fb49718e81ae544c1bb24142ecb68c8efff2e Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Wed, 22 Mar 2000 05:39:35 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/class.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 18593169e7b7..36dca353b803 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2000-03-21 Mark Mitchell + * 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 3298b7ad3ad0..12095ad95bd1 100644 --- 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. */ -- 2.47.2