Commit 669c722
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,6 +5,7 @@ | |||
| 5 | 5 | #include "third_party/zlib/google/zip_writer.h" | |
| 6 | 6 | ||
| 7 | 7 | #include <algorithm> | |
| 8 | + #include <tuple> | ||
| 8 | 9 | ||
| 9 | 10 | #include "base/files/file.h" | |
| 10 | 11 | #include "base/logging.h" | |
@@ -193,8 +194,8 @@ bool ZipWriter::AddMixedEntries(Paths paths) { | |||
| 193 | 194 | while (!paths.empty()) { | |
| 194 | 195 | // Work with chunks of 50 paths at most. | |
| 195 | 196 | const size_t n = std::min<size_t>(paths.size(), 50); | |
| 196 | - const Paths relative_paths = paths.subspan(0, n); | ||
| 197 | - paths = paths.subspan(n, paths.size() - n); | ||
| 197 | + Paths relative_paths; | ||
| 198 | + std::tie(relative_paths, paths) = paths.split_at(n); | ||
| 198 | 199 | ||
| 199 | 200 | files.clear(); | |
| 200 | 201 | if (!file_accessor_->Open(relative_paths, &files) || files.size() != n) | |
@@ -233,8 +234,8 @@ bool ZipWriter::AddFileEntries(Paths paths) { | |||
| 233 | 234 | while (!paths.empty()) { | |
| 234 | 235 | // Work with chunks of 50 paths at most. | |
| 235 | 236 | const size_t n = std::min<size_t>(paths.size(), 50); | |
| 236 | - const Paths relative_paths = paths.subspan(0, n); | ||
| 237 | - paths = paths.subspan(n, paths.size() - n); | ||
| 237 | + Paths relative_paths; | ||
| 238 | + std::tie(relative_paths, paths) = paths.split_at(n); | ||
| 238 | 239 | ||
| 239 | 240 | DCHECK_EQ(relative_paths.size(), n); | |
| 240 | 241 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,5 +2,5 @@ | |||
| 2 | 2 | // Refer to tools/dep_updaters/update-zlib.sh | |
| 3 | 3 | #ifndef SRC_ZLIB_VERSION_H_ | |
| 4 | 4 | #define SRC_ZLIB_VERSION_H_ | |
| 5 | - #define ZLIB_VERSION "1.3.0.1-motley-7e2e4d7" | ||
| 5 | + #define ZLIB_VERSION "1.3.0.1-motley-82a5fec" | ||
| 6 | 6 | #endif // SRC_ZLIB_VERSION_H_ | |
0 commit comments