diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-01 00:06:24 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-01 00:06:24 +0000 |
commit | 0e9e599b00ff3cd23541ed911aa0932f4ab2cef7 (patch) | |
tree | ab7d448612c86477a946dc0c830f5e49150eb9b1 /src/libstore/references.hh | |
parent | 66834068432d316ee558717765851835ceec2dcc (diff) | |
parent | a3f9625818ecb0c8a3c22c191340dac5a3120bb5 (diff) |
Merge remote-tracking branch 'upstream/master' into path-info
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 { |