@@ -647,10 +647,10 @@ class SourceFileDepGraphConstructor {
647
647
namesForProvidersOfAGivenType (std::vector<ContentsT> &contentsVec) {
648
648
std::vector<ContextNameFingerprint> result;
649
649
for (const auto declOrPair : contentsVec)
650
- result.push_back (
651
- { DependencyKey::computeContextForProvidedEntity<kind>(declOrPair),
652
- DependencyKey::computeNameForProvidedEntity<kind>(declOrPair),
653
- Optional<std::string>()} );
650
+ result.push_back (ContextNameFingerprint (
651
+ DependencyKey::computeContextForProvidedEntity<kind>(declOrPair),
652
+ DependencyKey::computeNameForProvidedEntity<kind>(declOrPair),
653
+ Optional<std::string>()) );
654
654
return result;
655
655
}
656
656
@@ -733,11 +733,11 @@ void SourceFileDepGraphConstructor::addAllDependenciesFrom(
733
733
void SourceFileDepGraphConstructor::addSourceFileNodesToGraph () {
734
734
g.findExistingNodePairOrCreateAndAddIfNew (
735
735
NodeKind::sourceFileProvide,
736
- { DependencyKey::computeContextForProvidedEntity<
737
- NodeKind::sourceFileProvide>(swiftDeps),
738
- DependencyKey::computeNameForProvidedEntity<NodeKind::sourceFileProvide>(
739
- swiftDeps),
740
- getSourceFileFingerprint ()} );
736
+ ContextNameFingerprint ( DependencyKey::computeContextForProvidedEntity<
737
+ NodeKind::sourceFileProvide>(swiftDeps),
738
+ DependencyKey::computeNameForProvidedEntity<
739
+ NodeKind::sourceFileProvide>( swiftDeps),
740
+ getSourceFileFingerprint ()) );
741
741
}
742
742
743
743
void SourceFileDepGraphConstructor::addProviderNodesToGraph () {
@@ -824,23 +824,23 @@ static std::vector<ContextNameFingerprint>
824
824
getBaseNameProvides (ArrayRef<std::string> simpleNames) {
825
825
std::vector<ContextNameFingerprint> result;
826
826
for (StringRef n : simpleNames)
827
- result.push_back ({ " " , n.str (), None} );
827
+ result.push_back (ContextNameFingerprint ( " " , n.str (), None) );
828
828
return result;
829
829
}
830
830
831
831
static std::vector<ContextNameFingerprint>
832
832
getMangledHolderProvides (ArrayRef<std::string> simpleNames) {
833
833
std::vector<ContextNameFingerprint> result;
834
834
for (StringRef n : simpleNames)
835
- result.push_back ({ n.str (), " " , None} );
835
+ result.push_back (ContextNameFingerprint ( n.str (), " " , None) );
836
836
return result;
837
837
}
838
838
839
839
static std::vector<ContextNameFingerprint> getCompoundProvides (
840
840
ArrayRef<std::pair<std::string, std::string>> compoundNames) {
841
841
std::vector<ContextNameFingerprint> result;
842
842
for (const auto &p : compoundNames)
843
- result.push_back ({ p.first , p.second , None} );
843
+ result.push_back (ContextNameFingerprint ( p.first , p.second , None) );
844
844
return result;
845
845
}
846
846
0 commit comments