aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-29 16:14:39 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-29 16:14:39 +0100
commit6170bb474bd7a038e03f212b12e403fad90c5403 (patch)
tree328247aefd7f2615459ffdb8d2b2d55c499c004e
parent0b907321cca39368c5abcb3f5e6d73d5ab2e3e40 (diff)
Eliminate local-binary-cache-store.hh
-rw-r--r--src/libstore/local-binary-cache-store.cc26
-rw-r--r--src/libstore/local-binary-cache-store.hh31
2 files changed, 25 insertions, 32 deletions
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index 9fae80870..a10c9d106 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -1,7 +1,31 @@
-#include "local-binary-cache-store.hh"
+#include "binary-cache-store.hh"
namespace nix {
+class LocalBinaryCacheStore : public BinaryCacheStore
+{
+private:
+
+ Path binaryCacheDir;
+
+public:
+
+ LocalBinaryCacheStore(std::shared_ptr<Store> localStore,
+ const Path & secretKeyFile, const Path & publicKeyFile,
+ const Path & binaryCacheDir);
+
+ void init() override;
+
+protected:
+
+ bool fileExists(const std::string & path) override;
+
+ void upsertFile(const std::string & path, const std::string & data) override;
+
+ std::string getFile(const std::string & path) override;
+
+};
+
LocalBinaryCacheStore::LocalBinaryCacheStore(std::shared_ptr<Store> localStore,
const Path & secretKeyFile, const Path & publicKeyFile,
const Path & binaryCacheDir)
diff --git a/src/libstore/local-binary-cache-store.hh b/src/libstore/local-binary-cache-store.hh
deleted file mode 100644
index 0303ebe73..000000000
--- a/src/libstore/local-binary-cache-store.hh
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "binary-cache-store.hh"
-
-namespace nix {
-
-class LocalBinaryCacheStore : public BinaryCacheStore
-{
-private:
-
- Path binaryCacheDir;
-
-public:
-
- LocalBinaryCacheStore(std::shared_ptr<Store> localStore,
- const Path & secretKeyFile, const Path & publicKeyFile,
- const Path & binaryCacheDir);
-
- void init() override;
-
-protected:
-
- bool fileExists(const std::string & path) override;
-
- void upsertFile(const std::string & path, const std::string & data) override;
-
- std::string getFile(const std::string & path) override;
-
-};
-
-}