diff options
author | brucedawson <brucedawson@chromium.org> | 2015-12-02 17:54:27 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-03 01:55:35 +0000 |
commit | c8e9e0d00bc2ba692ee4e61ae728a50e911513c1 (patch) | |
tree | bfbcb8da6e5e414de5577c01a3c263d77ee6578c /printing | |
parent | 77c735a0eb3207605a8b5f841574468d7dcb8c81 (diff) | |
download | chromium_src-c8e9e0d00bc2ba692ee4e61ae728a50e911513c1.zip chromium_src-c8e9e0d00bc2ba692ee4e61ae728a50e911513c1.tar.gz chromium_src-c8e9e0d00bc2ba692ee4e61ae728a50e911513c1.tar.bz2 |
Misc fixes for gn builds with VS 2015
These changes are enough to get gn_all building with VS 2015 in
32-bit gn builds. The changes are mostly to fix warnings about
truncation from size_t to smaller types.
One fix is to avoid illegal #defines, already fixed in the GYP builds.
Warning 4267 is disabled in the main BUILD.gn file because many of the
4244 warnings that VC++ 2013 emits are now emitted as 4267, so we need
to disable 4267 everywhere that 4244 is disabled. Fixing the code is
best done as a separate task.
The code fixes are to avoid truncations, mostly by using more
appropriate types.
BUG=440500
Review URL: https://codereview.chromium.org/1488933002
Cr-Commit-Position: refs/heads/master@{#362858}
Diffstat (limited to 'printing')
-rw-r--r-- | printing/printing_context_win_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc index aab83f3..6b2b20f 100644 --- a/printing/printing_context_win_unittest.cc +++ b/printing/printing_context_win_unittest.cc @@ -118,13 +118,13 @@ class MockPrintingContextWin : public PrintingContextSytemDialogWin { memcpy(reinterpret_cast<uint8*>(dev_names_ptr) + dev_names->wDriverOffset, info_2.get()->pDriverName, driver_size); - dev_names->wDeviceOffset = - dev_names->wDriverOffset + driver_size / sizeof(wchar_t); + dev_names->wDeviceOffset = base::checked_cast<WORD>( + dev_names->wDriverOffset + driver_size / sizeof(wchar_t)); memcpy(reinterpret_cast<uint8*>(dev_names_ptr) + dev_names->wDeviceOffset, info_2.get()->pPrinterName, printer_size); - dev_names->wOutputOffset = - dev_names->wDeviceOffset + printer_size / sizeof(wchar_t); + dev_names->wOutputOffset = base::checked_cast<WORD>( + dev_names->wDeviceOffset + printer_size / sizeof(wchar_t)); memcpy(reinterpret_cast<uint8*>(dev_names_ptr) + dev_names->wOutputOffset, info_2.get()->pPortName, port_size); |