|
22 | 22 | #endif
|
23 | 23 | #if REVISION <= 4
|
24 | 24 | // Pre-TODO layout.
|
25 |
| -#define UB_PADDING |
| 25 | +#define NON_STANDARD_PADDING |
26 | 26 | #endif
|
27 | 27 | // REVISION == 5: current layout
|
28 | 28 |
|
|
38 | 38 | namespace std {
|
39 | 39 | namespace __lldb {
|
40 | 40 |
|
41 |
| -#ifdef UB_PADDING |
| 41 | +#ifdef NON_STANDARD_PADDING |
42 | 42 | #if defined(ALTERNATE_LAYOUT) && defined(SUBCLASS_PADDING)
|
43 | 43 | template <class _CharT, size_t = sizeof(_CharT)> struct __padding {
|
44 | 44 | unsigned char __xx[sizeof(_CharT) - 1];
|
45 | 45 | };
|
46 | 46 |
|
47 | 47 | template <class _CharT> struct __padding<_CharT, 1> {};
|
48 | 48 | #endif
|
49 |
| -#else // !UB_PADDING |
| 49 | +#else // !NON_STANDARD_PADDING |
50 | 50 | template <size_t _PaddingSize> struct __padding {
|
51 | 51 | char __padding_[_PaddingSize];
|
52 | 52 | };
|
@@ -89,7 +89,7 @@ template <class _CharT, class _Traits, class _Allocator> class basic_string {
|
89 | 89 | };
|
90 | 90 | #else // !SUBCLASS_PADDING
|
91 | 91 |
|
92 |
| -#ifdef UB_PADDING |
| 92 | +#ifdef NON_STANDARD_PADDING |
93 | 93 | unsigned char __padding[sizeof(value_type) - 1];
|
94 | 94 | #else
|
95 | 95 | [[no_unique_address]] __padding<sizeof(value_type) - 1> __padding_;
|
@@ -159,11 +159,11 @@ template <class _CharT, class _Traits, class _Allocator> class basic_string {
|
159 | 159 | unsigned char __is_long_ : 1;
|
160 | 160 | unsigned char __size_ : 7;
|
161 | 161 | END_PACKED_ANON_STRUCT
|
162 |
| -#ifdef UB_PADDING |
| 162 | +#ifdef NON_STANDARD_PADDING |
163 | 163 | unsigned char __padding[sizeof(value_type) - 1];
|
164 |
| -#else // !UB_PADDING |
| 164 | +#else // !NON_STANDARD_PADDING |
165 | 165 | [[no_unique_address]] __padding<sizeof(value_type) - 1> __padding_;
|
166 |
| -#endif // UB_PADDING |
| 166 | +#endif // NON_STANDARD_PADDING |
167 | 167 |
|
168 | 168 | #endif // SHORT_UNION
|
169 | 169 | value_type __data_[__min_cap];
|
|
0 commit comments