Skip to content

Commit 8c72ff7

Browse files
bgra8Bogdan Graur
andauthored
[NFC] Renames a template parameter to avoid clashes with userspace names. (#76829)
Co-authored-by: Bogdan Graur <[email protected]>
1 parent 18c0f59 commit 8c72ff7

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

libcxx/include/__format/format_arg_store.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,15 @@ _LIBCPP_HIDE_FROM_ABI void __store_basic_format_arg(basic_format_arg<_Context>*
228228
([&] { *__data++ = __format::__create_format_arg<_Context>(__args); }(), ...);
229229
}
230230

231-
template <class _Context, size_t N>
231+
template <class _Context, size_t _Np>
232232
struct __packed_format_arg_store {
233-
__basic_format_arg_value<_Context> __values_[N];
233+
__basic_format_arg_value<_Context> __values_[_Np];
234234
uint64_t __types_ = 0;
235235
};
236236

237-
template <class _Context, size_t N>
237+
template <class _Context, size_t _Np>
238238
struct __unpacked_format_arg_store {
239-
basic_format_arg<_Context> __args_[N];
239+
basic_format_arg<_Context> __args_[_Np];
240240
};
241241

242242
} // namespace __format

libcxx/test/libcxx/system_reserved_names.gen.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@
131131
#define E SYSTEM_RESERVED_NAME
132132
#define Ep SYSTEM_RESERVED_NAME
133133
#define Es SYSTEM_RESERVED_NAME
134+
#define N SYSTEM_RESERVED_NAME
135+
#define Np SYSTEM_RESERVED_NAME
136+
#define Ns SYSTEM_RESERVED_NAME
134137
#define R SYSTEM_RESERVED_NAME
135138
#define Rp SYSTEM_RESERVED_NAME
136139
#define Rs SYSTEM_RESERVED_NAME

0 commit comments

Comments
 (0)