picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

Remove #include

Browse source
This commit is contained in:
Eelco Dolstra 2019-11-06 17:30:48 +01:00
parent f5b7991e59
commit 04bf9acd22
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/download.cc
View file

@ -34,6 +34,10 @@ DownloadSettings downloadSettings;
static GlobalConfig::Register r1(&downloadSettings); static GlobalConfig::Register r1(&downloadSettings);
CachedDownloadRequest::CachedDownloadRequest(const std::string & uri)
: uri(uri), ttl(settings.tarballTtl)
{ }
std::string resolveUri(const std::string & uri) std::string resolveUri(const std::string & uri)
{ {
if (uri.compare(0, 8, "channel:") == 0) if (uri.compare(0, 8, "channel:") == 0)

8
src/libstore/download.hh
View file

@ -2,7 +2,7 @@
#include "types.hh" #include "types.hh"
#include "hash.hh" #include "hash.hh"
#include "globals.hh" #include "config.hh"
#include <string> #include <string>
#include <future> #include <future>
@ -71,10 +71,10 @@ struct CachedDownloadRequest
bool unpack = false; bool unpack = false;
std::string name; std::string name;
Hash expectedHash; Hash expectedHash;
unsigned int ttl = settings.tarballTtl; unsigned int ttl;
CachedDownloadRequest(const std::string & uri) CachedDownloadRequest(const std::string & uri);
: uri(uri) { } CachedDownloadRequest() = delete;
}; };
struct CachedDownloadResult struct CachedDownloadResult