diff options
| author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2023-05-22 09:34:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 09:34:34 +0200 |
| commit | 673fe85976b00a6324697b2db4a5d12a7ef57829 (patch) | |
| tree | 323d9ae0cd54ec82c3316d0f29845fc21f03c3ec /src/libstore/path-info.cc | |
| parent | 3305fd0cb199d1c5e9e53971769960e629493211 (diff) | |
| parent | cb5052d98fa9a5d64d1700fe434c1c37a72e45d1 (diff) | |
Merge pull request #8365 from obsidiansystems/proto-structs
Revert "Revert "Use template structs instead of phantoms""
Diffstat (limited to 'src/libstore/path-info.cc')
| -rw-r--r-- | src/libstore/path-info.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/path-info.cc b/src/libstore/path-info.cc index 7eeda35d1..97b72faa3 100644 --- a/src/libstore/path-info.cc +++ b/src/libstore/path-info.cc @@ -132,7 +132,7 @@ ValidPathInfo ValidPathInfo::read(Source & source, const Store & store, unsigned auto narHash = Hash::parseAny(readString(source), htSHA256); ValidPathInfo info(path, narHash); if (deriver != "") info.deriver = store.parseStorePath(deriver); - info.references = worker_proto::read(store, source, Phantom<StorePathSet> {}); + info.references = WorkerProto<StorePathSet>::read(store, source); source >> info.registrationTime >> info.narSize; if (format >= 16) { source >> info.ultimate; @@ -153,7 +153,7 @@ void ValidPathInfo::write( sink << store.printStorePath(path); sink << (deriver ? store.printStorePath(*deriver) : "") << narHash.to_string(Base16, false); - worker_proto::write(store, sink, references); + workerProtoWrite(store, sink, references); sink << registrationTime << narSize; if (format >= 16) { sink << ultimate |