aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-11-26 21:07:44 +0100
committerEelco Dolstra <edolstra@gmail.com>2019-11-26 21:07:44 +0100
commit313106d5491c7c6279f3c962348462ca04cd2e0e (patch)
treedfa2c9ebe97279fcdfa365cd17ec74691b94d5f9 /src/libstore
parent425991883acafdaf287f9c60b584a49705542642 (diff)
Fix clang warnings
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/nar-info-disk-cache.hh2
-rw-r--r--src/libstore/remote-store.hh2
-rw-r--r--src/libstore/ssh-store.cc2
-rw-r--r--src/libstore/store-api.cc2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/libstore/nar-info-disk-cache.hh b/src/libstore/nar-info-disk-cache.hh
index 11e6c55ca..285873f7e 100644
--- a/src/libstore/nar-info-disk-cache.hh
+++ b/src/libstore/nar-info-disk-cache.hh
@@ -10,6 +10,8 @@ class NarInfoDiskCache
public:
typedef enum { oValid, oInvalid, oUnknown } Outcome;
+ virtual ~NarInfoDiskCache() { };
+
virtual void createCache(const std::string & uri, const Path & storeDir,
bool wantMassQuery, int priority) = 0;
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 84de4c460..728df8b00 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -148,7 +148,7 @@ public:
std::string getUri() override;
- bool sameMachine()
+ bool sameMachine() override
{ return true; }
private:
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 93e117389..b9d0c41ea 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -35,7 +35,7 @@ public:
return uriScheme + host;
}
- bool sameMachine()
+ bool sameMachine() override
{ return false; }
void narFromPath(const Path & path, Sink & sink) override;
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 0758907e7..7e548ecd2 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -216,7 +216,7 @@ static std::string makeType(string && type, const PathSet & references)
type += ":";
type += i;
}
- return type;
+ return std::move(type);
}