@@ -152,7 +152,7 @@ enum class APIAvailability {
152
152
153
153
/* TO_UPSTREAM(BoundsSafety) ON */
154
154
namespace {
155
- struct BoundsSafety {
155
+ struct BoundsSafetyNotes {
156
156
BoundsSafetyInfo::BoundsSafetyKind Kind;
157
157
unsigned Level = 0 ;
158
158
StringRef BoundsExpr = " " ;
@@ -215,7 +215,7 @@ struct Param {
215
215
std::optional<NullabilityKind> Nullability;
216
216
std::optional<RetainCountConventionKind> RetainCountConvention;
217
217
/* TO_UPSTREAM(BoundsSafety) ON */
218
- std::optional<BoundsSafety > BoundsSafety;
218
+ std::optional<BoundsSafetyNotes > BoundsSafety;
219
219
/* TO_UPSTREAM(BoundsSafety) OFF */
220
220
StringRef Type;
221
221
};
@@ -275,8 +275,8 @@ template <> struct MappingTraits<Param> {
275
275
};
276
276
277
277
/* TO_UPSTREAM(BoundsSafety) ON */
278
- template <> struct MappingTraits <BoundsSafety > {
279
- static void mapping (IO &IO, BoundsSafety &BS) {
278
+ template <> struct MappingTraits <BoundsSafetyNotes > {
279
+ static void mapping (IO &IO, BoundsSafetyNotes &BS) {
280
280
IO.mapRequired (" Kind" , BS.Kind );
281
281
IO.mapRequired (" BoundedBy" , BS.BoundsExpr );
282
282
IO.mapOptional (" Level" , BS.Level , 0 );
0 commit comments