diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-30 00:39:06 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-30 00:39:06 +0000 |
commit | 45a0ed82f089158a79c8c25ef844c55e4a74fc35 (patch) | |
tree | ddc7d1644214b7cc8ca448c99e4395af179c7b29 /src/libstore/export-import.cc | |
parent | e9fc2031f0c89fe65609ce6a8211186d164152fb (diff) |
Revert "Use template structs instead of phantoms"
This reverts commit 9ab07e99f527d1fa3adfa02839da477a1528d64b.
Diffstat (limited to 'src/libstore/export-import.cc')
-rw-r--r-- | src/libstore/export-import.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/export-import.cc b/src/libstore/export-import.cc index b59b34dee..40a6f3c63 100644 --- a/src/libstore/export-import.cc +++ b/src/libstore/export-import.cc @@ -45,7 +45,7 @@ void Store::exportPath(const StorePath & path, Sink & sink) teeSink << exportMagic << printStorePath(path); - WorkerProto<StorePathSet>::write(*this, teeSink, info->references); + nix::worker_proto::write(*this, teeSink, info->references); teeSink << (info->deriver ? printStorePath(*info->deriver) : "") << 0; @@ -73,7 +73,7 @@ StorePaths Store::importPaths(Source & source, CheckSigsFlag checkSigs) //Activity act(*logger, lvlInfo, format("importing path '%s'") % info.path); - auto references = WorkerProto<StorePathSet>::read(*this, source); + auto references = nix::worker_proto::read(*this, source, Phantom<StorePathSet> {}); auto deriver = readString(source); auto narHash = hashString(htSHA256, *saved.s); |