@@ -366,9 +366,10 @@ class InheritedProtocolCollector {
366
366
if (canPrintNormally)
367
367
IncludedProtocols.push_back (protoTy->getDecl ());
368
368
else
369
- ExtraProtocols.push_back ({protoTy->getDecl (),
369
+ ExtraProtocols.push_back (
370
+ ProtocolAndAvailability (protoTy->getDecl (),
370
371
getAvailabilityAttrs (D, availableAttrs),
371
- inherited.isUnchecked } );
372
+ inherited.isUnchecked ) );
372
373
}
373
374
// FIXME: This ignores layout constraints, but currently we don't support
374
375
// any of those besides 'AnyObject'.
@@ -385,9 +386,10 @@ class InheritedProtocolCollector {
385
386
for (auto *conf : localConformances) {
386
387
if (conf->getSourceKind () != ConformanceEntryKind::Synthesized)
387
388
continue ;
388
- ExtraProtocols.push_back ({conf->getProtocol (),
389
+ ExtraProtocols.push_back (
390
+ ProtocolAndAvailability (conf->getProtocol (),
389
391
getAvailabilityAttrs (D, availableAttrs),
390
- isUncheckedConformance (conf)} );
392
+ isUncheckedConformance (conf)) );
391
393
}
392
394
}
393
395
}
@@ -568,7 +570,8 @@ class InheritedProtocolCollector {
568
570
if (isPublicOrUsableFromInline (inherited) &&
569
571
conformanceDeclaredInModule (M, nominal, inherited) &&
570
572
!M->isImportedImplementationOnly (inherited->getParentModule ())) {
571
- protocolsToPrint.push_back ({inherited, availability, isUnchecked});
573
+ protocolsToPrint.push_back (
574
+ ProtocolAndAvailability (inherited, availability, isUnchecked));
572
575
return TypeWalker::Action::SkipChildren;
573
576
}
574
577
0 commit comments