diff options
| author | Peter Kasting <pkasting@chromium.org> | 2021-02-01 21:28:20 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-02-01 13:34:13 -0800 |
| commit | bf44340d1b6be1af8950bbdf664fec0cf5a831cc (patch) | |
| tree | b431323b009bff4d1a81757e9c7e6f7533e6ee0d /google | |
| parent | c876c8f87101c5a75f6014b0f832499afeb65b73 (diff) | |
| download | zlib-bf44340d1b6be1af8950bbdf664fec0cf5a831cc.tar.gz | |
Make components_unittests build with string16=std::u16string.
Commonly, this requires making Windows-API-specific code more consistent
about using std::wstring instead of assuming it's the same as string16.
Bug: 911896
Change-Id: I05cc9bb1ff851bcbf9b5a770dfb446f0fc187804
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2661802
Reviewed-by: Satoru Takabayashi <satorux@chromium.org>
Reviewed-by: Roger Tawa <rogerta@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Reviewed-by: Robert Liao <robliao@chromium.org>
Reviewed-by: Wei Li <weili@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#849267}
GitOrigin-RevId: 31fa0f2aa8747674276d61cd4915d11a4e764422
Diffstat (limited to 'google')
| -rw-r--r-- | google/zip_internal.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/google/zip_internal.cc b/google/zip_internal.cc index 9cbb78c..354fbf8 100644 --- a/google/zip_internal.cc +++ b/google/zip_internal.cc @@ -56,10 +56,10 @@ void* ZipOpenFunc(void *opaque, const char* filename, int mode) { creation_disposition = CREATE_ALWAYS; } - base::string16 filename16 = base::UTF8ToUTF16(filename); + std::wstring filenamew = base::UTF8ToWide(filename); if ((filename != NULL) && (desired_access != 0)) { - file = CreateFile(filename16.c_str(), desired_access, share_mode, - NULL, creation_disposition, flags_and_attributes, NULL); + file = CreateFile(filenamew.c_str(), desired_access, share_mode, NULL, + creation_disposition, flags_and_attributes, NULL); } if (file == INVALID_HANDLE_VALUE) |