diff options
| author | scottmg <scottmg@chromium.org> | 2015-04-30 19:48:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-01 02:49:29 +0000 |
| commit | c03e665e34982fe98f197a4a0b589f62192087ed (patch) | |
| tree | 928990e1c576b8259f09f905e326e95acd3afc9e /base | |
| parent | 2520d05488d847353d39d494bc30221f05581294 (diff) | |
| download | chromium_src-c03e665e34982fe98f197a4a0b589f62192087ed.zip chromium_src-c03e665e34982fe98f197a4a0b589f62192087ed.tar.gz chromium_src-c03e665e34982fe98f197a4a0b589f62192087ed.tar.bz2 | |
vs2015: avoid warning about narrowing pointer to int in base/win
R=cpu@chromium.org
BUG=440500
Review URL: https://codereview.chromium.org/1113043003
Cr-Commit-Position: refs/heads/master@{#327866}
Diffstat (limited to 'base')
| -rw-r--r-- | base/win/shortcut.cc | 8 | ||||
| -rw-r--r-- | base/win/win_util.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/base/win/shortcut.cc b/base/win/shortcut.cc index 207fdbe..f8b2182 100644 --- a/base/win/shortcut.cc +++ b/base/win/shortcut.cc @@ -321,8 +321,8 @@ bool TaskbarPinShortcutLink(const wchar_t* shortcut) { if (GetVersion() < VERSION_WIN7) return false; - int result = reinterpret_cast<int>(ShellExecute(NULL, L"taskbarpin", shortcut, - NULL, NULL, 0)); + intptr_t result = reinterpret_cast<intptr_t>( + ShellExecute(NULL, L"taskbarpin", shortcut, NULL, NULL, 0)); return result > 32; } @@ -333,8 +333,8 @@ bool TaskbarUnpinShortcutLink(const wchar_t* shortcut) { if (GetVersion() < VERSION_WIN7) return false; - int result = reinterpret_cast<int>(ShellExecute(NULL, L"taskbarunpin", - shortcut, NULL, NULL, 0)); + intptr_t result = reinterpret_cast<intptr_t>( + ShellExecute(NULL, L"taskbarunpin", shortcut, NULL, NULL, 0)); return result > 32; } diff --git a/base/win/win_util.cc b/base/win/win_util.cc index 59ae375..c5b06c4 100644 --- a/base/win/win_util.cc +++ b/base/win/win_util.cc @@ -428,7 +428,7 @@ bool DisplayVirtualKeyboard() { NULL, NULL, SW_SHOW); - return reinterpret_cast<int>(ret) > 32; + return reinterpret_cast<intptr_t>(ret) > 32; } bool DismissVirtualKeyboard() { |