From fdbbcc44924cb4d9028fa68b2f7d423fb5d8670f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2016 18:09:30 +0200 Subject: Remove addPathToAccessor --- src/libstore/binary-cache-store.hh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/libstore/binary-cache-store.hh') diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh index 333cf08562a0..31878bbb2476 100644 --- a/src/libstore/binary-cache-store.hh +++ b/src/libstore/binary-cache-store.hh @@ -93,22 +93,23 @@ public: bool wantMassQuery() override { return wantMassQuery_; } void addToStore(const ValidPathInfo & info, const ref & nar, - bool repair = false, bool dontCheckSigs = false) override; + bool repair, bool dontCheckSigs, + std::shared_ptr accessor) override; Path addToStore(const string & name, const Path & srcPath, - bool recursive = true, HashType hashAlgo = htSHA256, - PathFilter & filter = defaultPathFilter, bool repair = false) override; + bool recursive, HashType hashAlgo, + PathFilter & filter, bool repair) override; Path addTextToStore(const string & name, const string & s, - const PathSet & references, bool repair = false) override; + const PathSet & references, bool repair) override; void narFromPath(const Path & path, Sink & sink) override; - void buildPaths(const PathSet & paths, BuildMode buildMode = bmNormal) override + void buildPaths(const PathSet & paths, BuildMode buildMode) override { notImpl(); } BuildResult buildDerivation(const Path & drvPath, const BasicDerivation & drv, - BuildMode buildMode = bmNormal) override + BuildMode buildMode) override { notImpl(); } void ensurePath(const Path & path) override @@ -137,10 +138,6 @@ public: ref getFSAccessor() override; -private: - - void addPathToAccessor(ref, const Path & storePath, const ref & data) override; - public: void addSignatures(const Path & storePath, const StringSet & sigs) override -- cgit 1.4.1