aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/uds-remote-store.hh
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-12-20 15:33:12 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-12-20 15:47:14 +0000
commit1a1af75338cb9ed28dc00de2e696d8efc5d37287 (patch)
tree75d1c9758d5b2cf1ae453145ed170fdbf108ab10 /src/libstore/uds-remote-store.hh
parentec3e20283216374c15843c403363a890221d3fcb (diff)
Overhaul store subclassing
We embrace virtual the rest of the way, and get rid of the `assert(false)` 0-param constructors. We also list config base classes first, so the constructor order is always: 1. all the configs 2. all the stores Each in the same order
Diffstat (limited to 'src/libstore/uds-remote-store.hh')
-rw-r--r--src/libstore/uds-remote-store.hh7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libstore/uds-remote-store.hh b/src/libstore/uds-remote-store.hh
index e5de104c9..ddc7716cd 100644
--- a/src/libstore/uds-remote-store.hh
+++ b/src/libstore/uds-remote-store.hh
@@ -14,15 +14,10 @@ struct UDSRemoteStoreConfig : virtual LocalFSStoreConfig, virtual RemoteStoreCon
{
}
- UDSRemoteStoreConfig()
- : UDSRemoteStoreConfig(Store::Params({}))
- {
- }
-
const std::string name() override { return "Local Daemon Store"; }
};
-class UDSRemoteStore : public LocalFSStore, public RemoteStore, public virtual UDSRemoteStoreConfig
+class UDSRemoteStore : public virtual UDSRemoteStoreConfig, public virtual LocalFSStore, public virtual RemoteStore
{
public: