wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02: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

7
src/libstore/ssh-store.cc
View file

@ -11,20 +11,23 @@ namespace nix {
struct SSHStoreConfig : virtual RemoteStoreConfig
{
using RemoteStoreConfig::RemoteStoreConfig;
const Setting<Path> sshKey{(StoreConfig*) this, "", "ssh-key", "path to an SSH private key"};
const Setting<bool> compress{(StoreConfig*) this, false, "compress", "whether to compress the connection"};
const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
const Setting<std::string> remoteStore{(StoreConfig*) this, "", "remote-store", "URI of the store on the remote system"};
};
class SSHStore : public RemoteStore, public virtual SSHStoreConfig
class SSHStore : public virtual RemoteStore, public virtual SSHStoreConfig
{
public:
SSHStore(const std::string & host, const Params & params)
: Store(params)
: StoreConfig(params)
, Store(params)
, RemoteStoreConfig(params)
, RemoteStore(params)
, SSHStoreConfig(params)
, host(host)
, master(
host,