nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 09:19:36 +01:00
Code Activity

Correctly call all the parent contructors of the stores

Browse source 
Using virtual inheritance means that only the default constructors of
the parent classes will be called, which isn't what we want
This commit is contained in:
regnat 2020-09-11 11:06:18 +02:00
parent d184ad1d27
commit 5895184df4
12 changed files with 47 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libstore/local-store.hh
View file

@ -30,8 +30,17 @@ struct OptimiseStats
uint64_t blocksFreed = 0;
};
struct LocalStoreConfig : virtual LocalFSStoreConfig
{
using LocalFSStoreConfig::LocalFSStoreConfig;
class LocalStore : public LocalFSStore
Setting<bool> requireSigs{(StoreConfig*) this,
settings.requireSigs,
"require-sigs", "whether store paths should have a trusted signature on import"};
};
class LocalStore : public LocalFSStore, public virtual LocalStoreConfig
{
private:
@ -95,10 +104,6 @@ public:
private:
Setting<bool> requireSigs{(StoreConfig*) this,
settings.requireSigs,
"require-sigs", "whether store paths should have a trusted signature on import"};
const PublicKeys & getPublicKeys();
public: