diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2023-06-12 12:19:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-12 12:19:58 +0200 |
| commit | 041486b11674e0480ad85f63d262c33a09276ef1 (patch) | |
| tree | 6ee6bebd13da5c72a43acf8514108137015610eb | |
| parent | 03f9ff6ea59d21c6d7b29c64a03d5041bd621261 (diff) | |
| parent | 87c66f6b0f35bc59749cad6bfb3dc2e23de8c86b (diff) | |
Merge pull request #8493 from edolstra/no-md-include
Don't include uds-remote-store.md from a header file
| -rw-r--r-- | src/libstore/uds-remote-store.cc | 8 | ||||
| -rw-r--r-- | src/libstore/uds-remote-store.hh | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/libstore/uds-remote-store.cc b/src/libstore/uds-remote-store.cc index 0fb7c38e9..69dae2da5 100644 --- a/src/libstore/uds-remote-store.cc +++ b/src/libstore/uds-remote-store.cc @@ -13,6 +13,14 @@ namespace nix { +std::string UDSRemoteStoreConfig::doc() +{ + return + #include "uds-remote-store.md" + ; +} + + UDSRemoteStore::UDSRemoteStore(const Params & params) : StoreConfig(params) , LocalFSStoreConfig(params) diff --git a/src/libstore/uds-remote-store.hh b/src/libstore/uds-remote-store.hh index bd1dcb67c..3bbab371c 100644 --- a/src/libstore/uds-remote-store.hh +++ b/src/libstore/uds-remote-store.hh @@ -17,12 +17,7 @@ struct UDSRemoteStoreConfig : virtual LocalFSStoreConfig, virtual RemoteStoreCon const std::string name() override { return "Local Daemon Store"; } - std::string doc() override - { - return - #include "uds-remote-store.md" - ; - } + std::string doc() override; }; class UDSRemoteStore : public virtual UDSRemoteStoreConfig, public virtual LocalFSStore, public virtual RemoteStore |