wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

download.hh: Fix conflicts from nix-channel-c++ merge

Browse source
This commit is contained in:
Shea Levy 2016-08-31 09:57:56 -04:00
parent 572aba284a
commit dfe0938614
3 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/download.hh
View file

@ -32,12 +32,7 @@ struct Downloader
virtual DownloadResult download(string url, const DownloadOptions & options) = 0;
Path downloadCached(ref<Store> store, const string & url, bool unpack, string name = "",
const Hash & expectedHash = Hash());
/* Need to overload because can't have an rvalue default value for non-const reference */
Path downloadCached(ref<Store> store, const string & url, bool unpack,
string & effectiveUrl, const Hash & expectedHash = Hash());
const Hash & expectedHash = Hash(), string * effectiveUrl = nullptr);
enum Error { NotFound, Forbidden, Misc, Transient };
};