about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-29T15·14+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-02T14·46+0100
commit0402b6398d879889a621d60d049f8d81ac4ed86a (patch)
treee618f75e128bb43bff88c7d744f2991f406b3fc0
parent68a541498258949231e35544501e11c6003f2dce (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 9fae80870ade..a10c9d1069d5 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 0303ebe734a6..000000000000
--- 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;
-
-};
-
-}