diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-27 17:41:43 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-27 17:41:43 +0000 |
commit | e6115ca00453d0e6ff653634133b547f7b3f552d (patch) | |
tree | 8d260a671f47f31ce5863ead921015d4005614d7 /src/libstore/references.hh | |
parent | ac89462b7412f4d72f452552dffe36202bd528e9 (diff) | |
parent | 86805a2c0a25f5ceefac0d64e64ba57ace73b7f5 (diff) |
Merge remote-tracking branch 'upstream/master' into ca-derivation-data-types
Diffstat (limited to 'src/libstore/references.hh')
-rw-r--r-- | src/libstore/references.hh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstore/references.hh b/src/libstore/references.hh index c38bdd720..598a3203a 100644 --- a/src/libstore/references.hh +++ b/src/libstore/references.hh @@ -5,8 +5,7 @@ namespace nix { -PathSet scanForReferences(const Path & path, const PathSet & refs, - HashResult & hash); +std::pair<PathSet, HashResult> scanForReferences(const Path & path, const PathSet & refs); struct RewritingSink : Sink { |