diff options
| author | Ben Burdette <bburdette@gmail.com> | 2020-05-11 14:35:30 -0600 |
|---|---|---|
| committer | Ben Burdette <bburdette@gmail.com> | 2020-05-11 14:35:30 -0600 |
| commit | 59b1f5c70150a81c7a6fa0dc3309a9d44e9621f8 (patch) | |
| tree | 542fc01dfaffdf7acbc5c1a89fd41a0918396f4b /src/libstore/s3-binary-cache-store.cc | |
| parent | 536bbf53e12c80f52c2679aec734d895b0058f5b (diff) | |
| parent | 5bdb67c84308a8cc78ac633d27b94eca87ea4390 (diff) | |
Merge branch 'master' into errors-phase-2
Diffstat (limited to 'src/libstore/s3-binary-cache-store.cc')
| -rw-r--r-- | src/libstore/s3-binary-cache-store.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 3175eb69b..427dd48ce 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -6,7 +6,7 @@ #include "nar-info-disk-cache.hh" #include "globals.hh" #include "compression.hh" -#include "download.hh" +#include "filetransfer.hh" #include "istringstream_nocopy.hh" #include <aws/core/Aws.h> @@ -136,7 +136,7 @@ ref<Aws::Client::ClientConfiguration> S3Helper::makeConfig(const string & region return res; } -S3Helper::DownloadResult S3Helper::getObject( +S3Helper::FileTransferResult S3Helper::getObject( const std::string & bucketName, const std::string & key) { debug("fetching 's3://%s/%s'...", bucketName, key); @@ -150,7 +150,7 @@ S3Helper::DownloadResult S3Helper::getObject( return Aws::New<std::stringstream>("STRINGSTREAM"); }); - DownloadResult res; + FileTransferResult res; auto now1 = std::chrono::steady_clock::now(); |