|
12 | 12 |
|
13 | 13 | TEST(Scrncell, StructsShouldBeTrivialAndHaveTheExpectedAlignmentAndSize)
|
14 | 14 | {
|
15 |
| - check_trivial_size_align(TColorDesired, 4, 4); |
16 |
| - check_trivial_size_align(TColorAttr, 8, 8); |
17 |
| - check_trivial_size_align(TAttrPair, 16, 8); |
18 |
| - check_trivial_size_align(TCellChar, 16, 1); |
19 |
| - check_trivial_size_align(TScreenCell, 24, 8); |
20 |
| - check_trivial_size_align(TColorBIOS, 1, 1); |
21 |
| - check_trivial_size_align(TColorRGB, 4, 4); |
22 |
| - check_trivial_size_align(TColorXTerm, 1, 1); |
| 15 | + // Use 'alignof(type)' rather than hardcoding the alignment values, |
| 16 | + // given that they may vary among systems. |
| 17 | + check_trivial_size_align(TColorDesired, 4, alignof(uint32_t)); |
| 18 | + check_trivial_size_align(TColorAttr, 8, alignof(uint64_t)); |
| 19 | + check_trivial_size_align(TAttrPair, 16, alignof(uint64_t)); |
| 20 | + check_trivial_size_align(TCellChar, 16, alignof(uint8_t)); |
| 21 | + check_trivial_size_align(TScreenCell, 24, alignof(uint64_t)); |
| 22 | + check_trivial_size_align(TColorBIOS, 1, alignof(uint8_t)); |
| 23 | + check_trivial_size_align(TColorRGB, 4, alignof(uint32_t)); |
| 24 | + check_trivial_size_align(TColorXTerm, 1, alignof(uint8_t)); |
23 | 25 | }
|
0 commit comments