aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-10-06 14:00:42 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-10-06 14:52:30 +0200
commitad143c5b3b7e713b89f0437ce17c20ac642ca530 (patch)
treee81c2c5e57115d9882ec22ed02e91fd8ea7c41b0 /src
parent2856878b411694d2a815a88a5b3fe81c0f15811e (diff)
Shut up some clang warnings
Diffstat (limited to 'src')
-rw-r--r--src/libexpr/eval-cache.hh2
-rw-r--r--src/libfetchers/fetchers.hh3
-rw-r--r--src/libfetchers/github.cc6
-rw-r--r--src/libstore/dummy-store.cc3
-rw-r--r--src/libstore/store-api.hh2
5 files changed, 10 insertions, 6 deletions
diff --git a/src/libexpr/eval-cache.hh b/src/libexpr/eval-cache.hh
index 8ffffc0ed..e23e45c94 100644
--- a/src/libexpr/eval-cache.hh
+++ b/src/libexpr/eval-cache.hh
@@ -11,7 +11,7 @@ namespace nix::eval_cache {
MakeError(CachedEvalError, EvalError);
-class AttrDb;
+struct AttrDb;
class AttrCursor;
class EvalCache : public std::enable_shared_from_this<EvalCache>
diff --git a/src/libfetchers/fetchers.hh b/src/libfetchers/fetchers.hh
index cc31a31b9..e8ae59143 100644
--- a/src/libfetchers/fetchers.hh
+++ b/src/libfetchers/fetchers.hh
@@ -86,6 +86,9 @@ public:
struct InputScheme
{
+ virtual ~InputScheme()
+ { }
+
virtual std::optional<Input> inputFromURL(const ParsedURL & url) = 0;
virtual std::optional<Input> inputFromAttrs(const Attrs & attrs) = 0;
diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
index 90893075e..92ff224f7 100644
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -25,7 +25,7 @@ struct GitArchiveInputScheme : InputScheme
{
virtual std::string type() = 0;
- virtual std::optional<std::pair<std::string, std::string> > accessHeaderFromToken(const std::string & token) const = 0;
+ virtual std::optional<std::pair<std::string, std::string>> accessHeaderFromToken(const std::string & token) const = 0;
std::optional<Input> inputFromURL(const ParsedURL & url) override
{
@@ -215,7 +215,7 @@ struct GitHubInputScheme : GitArchiveInputScheme
{
std::string type() override { return "github"; }
- std::optional<std::pair<std::string, std::string> > accessHeaderFromToken(const std::string & token) const
+ std::optional<std::pair<std::string, std::string>> accessHeaderFromToken(const std::string & token) const override
{
// Github supports PAT/OAuth2 tokens and HTTP Basic
// Authentication. The former simply specifies the token, the
@@ -270,7 +270,7 @@ struct GitLabInputScheme : GitArchiveInputScheme
{
std::string type() override { return "gitlab"; }
- std::optional<std::pair<std::string, std::string> > accessHeaderFromToken(const std::string & token) const
+ std::optional<std::pair<std::string, std::string>> accessHeaderFromToken(const std::string & token) const override
{
// Gitlab supports 4 kinds of authorization, two of which are
// relevant here: OAuth2 and PAT (Private Access Token). The
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index 736be8413..98b745c3a 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -18,8 +18,7 @@ struct DummyStore : public Store, public virtual DummyStoreConfig
DummyStore(const Params & params)
: StoreConfig(params)
, Store(params)
- {
- }
+ { }
string getUri() override
{
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 854446987..450c0f554 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -194,6 +194,8 @@ struct StoreConfig : public Config
*/
StoreConfig() { assert(false); }
+ virtual ~StoreConfig() { }
+
virtual const std::string name() = 0;
const PathSetting storeDir_{this, false, settings.nixStore,