File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 55#include " third_party/zlib/google/zip_writer.h"
66
77#include < algorithm>
8+ #include < tuple>
89
910#include " base/files/file.h"
1011#include " base/logging.h"
@@ -193,8 +194,8 @@ bool ZipWriter::AddMixedEntries(Paths paths) {
193194 while (!paths.empty ()) {
194195 // Work with chunks of 50 paths at most.
195196 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);
198199
199200 files.clear ();
200201 if (!file_accessor_->Open (relative_paths, &files) || files.size () != n)
@@ -233,8 +234,8 @@ bool ZipWriter::AddFileEntries(Paths paths) {
233234 while (!paths.empty ()) {
234235 // Work with chunks of 50 paths at most.
235236 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);
238239
239240 DCHECK_EQ (relative_paths.size (), n);
240241
Original file line number Diff line number Diff line change 22// Refer to tools/dep_updaters/update-zlib.sh
33#ifndef SRC_ZLIB_VERSION_H_
44#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 "
66#endif // SRC_ZLIB_VERSION_H_
You can’t perform that action at this time.
0 commit comments