diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-06-22 13:08:11 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-06-22 13:08:11 -0400 |
| commit | 66a62b3189c8c9b0965850e6b3c9b0fda0b50fd8 (patch) | |
| tree | 70a25a2cb1973a05559eca3134979fc8be873aca /src/libstore/worker-protocol.hh | |
| parent | f2a6cee334255ced72a70f527cf3c283b4586e42 (diff) | |
| parent | 965b80347e97169f266466603e29a57359c4083c (diff) | |
Merge remote-tracking branch 'origin/master' into substitute-other-storedir
Diffstat (limited to 'src/libstore/worker-protocol.hh')
| -rw-r--r-- | src/libstore/worker-protocol.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index d2944674f..5a3e33c08 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -69,7 +69,7 @@ template<class T> T readStorePaths(const Store & store, Source & from); void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths); -std::map<StorePath, std::optional<std::string>> readStorePathCAMap(const Store & store, Source & from); +StorePathCAMap readStorePathCAMap(const Store & store, Source & from); void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap & paths); |