diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-12-20 15:33:12 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-12-20 15:47:14 +0000 |
| commit | 1a1af75338cb9ed28dc00de2e696d8efc5d37287 (patch) | |
| tree | 75d1c9758d5b2cf1ae453145ed170fdbf108ab10 /src/libstore/s3-binary-cache-store.hh | |
| parent | ec3e20283216374c15843c403363a890221d3fcb (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/s3-binary-cache-store.hh')
| -rw-r--r-- | src/libstore/s3-binary-cache-store.hh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstore/s3-binary-cache-store.hh b/src/libstore/s3-binary-cache-store.hh index 4d43fe4d2..bce828b11 100644 --- a/src/libstore/s3-binary-cache-store.hh +++ b/src/libstore/s3-binary-cache-store.hh @@ -6,13 +6,11 @@ namespace nix { -class S3BinaryCacheStore : public BinaryCacheStore +class S3BinaryCacheStore : public virtual BinaryCacheStore { protected: - S3BinaryCacheStore(const Params & params) - : BinaryCacheStore(params) - { } + S3BinaryCacheStore(const Params & params); public: |