aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/derivations.hh
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-05-28 10:31:46 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-05-28 10:31:46 -0400
commitef71caba2960f163310d444db42ff30f5334b92f (patch)
treeb8fe57312ddfc212ba6d2ec06a47f6263651009b /src/libstore/derivations.hh
parent0f3f90107174c74e9416c58b5989047dd40fc61f (diff)
parentf60ce4fa207a210e23a1142d3a8ead611526e6e1 (diff)
Merge remote-tracking branch 'upstream/master' into more-rust-ffi
Diffstat (limited to 'src/libstore/derivations.hh')
-rw-r--r--src/libstore/derivations.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index f010318ce..ea517a78c 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -25,7 +25,7 @@ struct DerivationOutput
DerivationOutput(const DerivationOutput &) = default;
DerivationOutput(DerivationOutput &&) = default;
DerivationOutput & operator = (const DerivationOutput &) = default;
- void parseHashInfo(bool & recursive, Hash & hash) const;
+ void parseHashInfo(FileIngestionMethod & recursive, Hash & hash) const;
};
typedef std::map<string, DerivationOutput> DerivationOutputs;