@@ -647,10 +647,10 @@ class SourceFileDepGraphConstructor {
647647 namesForProvidersOfAGivenType (std::vector<ContentsT> &contentsVec) {
648648 std::vector<ContextNameFingerprint> result;
649649 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>()) );
654654 return result;
655655 }
656656
@@ -733,11 +733,11 @@ void SourceFileDepGraphConstructor::addAllDependenciesFrom(
733733void SourceFileDepGraphConstructor::addSourceFileNodesToGraph () {
734734 g.findExistingNodePairOrCreateAndAddIfNew (
735735 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 ()) );
741741}
742742
743743void SourceFileDepGraphConstructor::addProviderNodesToGraph () {
@@ -824,23 +824,23 @@ static std::vector<ContextNameFingerprint>
824824getBaseNameProvides (ArrayRef<std::string> simpleNames) {
825825 std::vector<ContextNameFingerprint> result;
826826 for (StringRef n : simpleNames)
827- result.push_back ({ " " , n.str (), None} );
827+ result.push_back (ContextNameFingerprint ( " " , n.str (), None) );
828828 return result;
829829}
830830
831831static std::vector<ContextNameFingerprint>
832832getMangledHolderProvides (ArrayRef<std::string> simpleNames) {
833833 std::vector<ContextNameFingerprint> result;
834834 for (StringRef n : simpleNames)
835- result.push_back ({ n.str (), " " , None} );
835+ result.push_back (ContextNameFingerprint ( n.str (), " " , None) );
836836 return result;
837837}
838838
839839static std::vector<ContextNameFingerprint> getCompoundProvides (
840840 ArrayRef<std::pair<std::string, std::string>> compoundNames) {
841841 std::vector<ContextNameFingerprint> result;
842842 for (const auto &p : compoundNames)
843- result.push_back ({ p.first , p.second , None} );
843+ result.push_back (ContextNameFingerprint ( p.first , p.second , None) );
844844 return result;
845845}
846846
0 commit comments