diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2000-03-22 05:39:35 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-03-22 05:39:35 +0000 |
| commit | 736fb49718e81ae544c1bb24142ecb68c8efff2e (patch) | |
| tree | a2a520b4e4801b8bc5b2860175b2de045bd4c5b5 /gcc | |
| parent | 9785e4b1f32f52aad66bb8071ac0f57a77686f9f (diff) | |
| download | gcc-736fb49718e81ae544c1bb24142ecb68c8efff2e.zip gcc-736fb49718e81ae544c1bb24142ecb68c8efff2e.tar.gz gcc-736fb49718e81ae544c1bb24142ecb68c8efff2e.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/class.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 18593169..36dca35 100644 --- 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 3298b7a..12095ad 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. */ |