diff options
| author | jade <lix@jade.fyi> | 2024-05-30 02:33:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-05-30 02:33:05 +0000 |
| commit | 562ff516ab27b8e98490646dd30ac96e7e2c36bb (patch) | |
| tree | 1798a20b33da0101bd91acf7da26c891f0cda620 /src/libstore/filetransfer.cc | |
| parent | c71f21da3ac4d95ef9a42a26416ccee71639dbd6 (diff) | |
| parent | a39ba22ff7112cd3984bbf28d8610d84dd525a0f (diff) | |
Merge changes from topic "libutil-split" into main
* changes:
util.hh: Delete remaining file and clean up headers
util.hh: Move nativeSystem to local-derivation-goal.cc
util.hh: Move stuff to types.hh
util.cc: Delete remaining file
util.{hh,cc}: Move ignoreException to error.{hh,cc}
util.{hh,cc}: Split out namespaces.{hh,cc}
util.{hh,cc}: Split out users.{hh,cc}
util.{hh,cc}: Split out strings.{hh,cc}
util.{hh,cc}: Split out unix-domain-socket.{hh,cc}
util.{hh,cc}: Split out child.{hh,cc}
util.{hh,cc}: Split out current-process.{hh,cc}
util.{hh,cc}: Split out processes.{hh,cc}
util.{hh,cc}: Split out file-descriptor.{hh,cc}
util.{hh,cc}: Split out file-system.{hh,cc}
util.{hh,cc}: Split out terminal.{hh,cc}
util.{hh,cc}: Split out environment-variables.{hh,cc}
Diffstat (limited to 'src/libstore/filetransfer.cc')
| -rw-r--r-- | src/libstore/filetransfer.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index 076a5ca56..76da8e415 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -1,5 +1,5 @@ #include "filetransfer.hh" -#include "util.hh" +#include "namespaces.hh" #include "globals.hh" #include "store-api.hh" #include "s3.hh" @@ -19,7 +19,6 @@ #include <algorithm> #include <cmath> #include <cstring> -#include <iostream> #include <queue> #include <random> #include <thread> |