diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2017-08-28 10:26:23 +0300 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2017-09-25 07:10:11 +0000 |
| commit | 09df67311f4621cc7504e2281d90241e7605a278 (patch) | |
| tree | fa07ee0ec531bc0c5a830fc556f6048d42ba509f /src/client/windows/unittests/exception_handler_death_test.cc | |
| parent | Refresh refresh_binaries.bat (diff) | |
| download | breakpad-09df67311f4621cc7504e2281d90241e7605a278.tar.xz | |
Fix MSVC build on 64-bit
Mostly int<->size_t implicit conversions.
Warning 4366 (The result of the unary '&' operator may be unaligned)
appears in minidump.cc:907, but I don't know why. It looks aligned to me.
Change-Id: I641942adc324f8f9832b20662083dc83498688a8
Reviewed-on: https://chromium-review.googlesource.com/637390
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'src/client/windows/unittests/exception_handler_death_test.cc')
| -rw-r--r-- | src/client/windows/unittests/exception_handler_death_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/windows/unittests/exception_handler_death_test.cc b/src/client/windows/unittests/exception_handler_death_test.cc index 30600d41..5ef9e64d 100644 --- a/src/client/windows/unittests/exception_handler_death_test.cc +++ b/src/client/windows/unittests/exception_handler_death_test.cc @@ -82,7 +82,7 @@ void ExceptionHandlerDeathTest::SetUp() { // The test case name is exposed as a c-style string, // convert it to a wchar_t string. int dwRet = MultiByteToWideChar(CP_ACP, 0, test_info->name(), - strlen(test_info->name()), + static_cast<int>(strlen(test_info->name())), test_name_wide, MAX_PATH); if (!dwRet) { @@ -293,8 +293,8 @@ wstring find_minidump_in_directory(const wstring &directory) { wstring filename; do { const wchar_t extension[] = L".dmp"; - const int extension_length = sizeof(extension) / sizeof(extension[0]) - 1; - const int filename_length = wcslen(find_data.cFileName); + const size_t extension_length = sizeof(extension) / sizeof(extension[0]) - 1; + const size_t filename_length = wcslen(find_data.cFileName); if (filename_length > extension_length && wcsncmp(extension, find_data.cFileName + filename_length - extension_length, |