diff options
| author | thakis <thakis@chromium.org> | 2015-12-10 11:29:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-10 19:30:43 +0000 |
| commit | 6ef917b3602be64cc612dfbd78e45f1f80e4d8dd (patch) | |
| tree | 28be680e5931100abbaf3618c51a456b2776ab9d /cloud_print | |
| parent | fee6f33fbeebaf5776663307d041fc06ad93ef8f (diff) | |
| download | chromium_src-6ef917b3602be64cc612dfbd78e45f1f80e4d8dd.zip chromium_src-6ef917b3602be64cc612dfbd78e45f1f80e4d8dd.tar.gz chromium_src-6ef917b3602be64cc612dfbd78e45f1f80e4d8dd.tar.bz2 | |
clang/win: Let remaining chromium_code targets build with -Wextra.
This is a follow-up to https://codereview.chromium.org/1507413003/ and
lets all translation units in a release build build if -Wextra is enabled
for chromium_code targets.
(This CL does not contain the change to actually turn on -Wextra, only
cleanups.)
BUG=567877
Review URL: https://codereview.chromium.org/1513043002
Cr-Commit-Position: refs/heads/master@{#364425}
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc index 84963c0..5df48a0 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc @@ -143,7 +143,7 @@ TEST_F(PortMonitorTest, EnumPortsTest) { 0, &needed_bytes, &returned)); - EXPECT_EQ(ERROR_INSUFFICIENT_BUFFER, GetLastError()); + EXPECT_EQ(static_cast<DWORD>(ERROR_INSUFFICIENT_BUFFER), GetLastError()); EXPECT_NE(0u, needed_bytes); EXPECT_EQ(0u, returned); @@ -171,7 +171,7 @@ TEST_F(PortMonitorTest, EnumPortsTest) { 0, &needed_bytes, &returned)); - EXPECT_EQ(ERROR_INSUFFICIENT_BUFFER, GetLastError()); + EXPECT_EQ(static_cast<DWORD>(ERROR_INSUFFICIENT_BUFFER), GetLastError()); EXPECT_NE(0u, needed_bytes); EXPECT_EQ(0u, returned); @@ -213,14 +213,9 @@ TEST_F(PortMonitorTest, FlowTest) { EXPECT_TRUE(monitor2->pfnXcvOpenPort(monitor_handle, NULL, 0, &xcv_handle)); EXPECT_TRUE(xcv_handle != NULL); EXPECT_TRUE(monitor2->pfnXcvDataPort != NULL); - EXPECT_EQ(ERROR_ACCESS_DENIED, - monitor2->pfnXcvDataPort(xcv_handle, - kXcvDataItem, - NULL, - 0, - buffer, - kBufferSize, - &bytes_needed)); + EXPECT_EQ(static_cast<DWORD>(ERROR_ACCESS_DENIED), + monitor2->pfnXcvDataPort(xcv_handle, kXcvDataItem, NULL, 0, buffer, + kBufferSize, &bytes_needed)); EXPECT_TRUE(monitor2->pfnXcvClosePort != NULL); EXPECT_TRUE(monitor2->pfnXcvClosePort(xcv_handle)); EXPECT_TRUE(monitor2->pfnXcvOpenPort(monitor_handle, @@ -229,14 +224,9 @@ TEST_F(PortMonitorTest, FlowTest) { &xcv_handle)); EXPECT_TRUE(xcv_handle != NULL); EXPECT_TRUE(monitor2->pfnXcvDataPort != NULL); - EXPECT_EQ(ERROR_SUCCESS, - monitor2->pfnXcvDataPort(xcv_handle, - kXcvDataItem, - NULL, - 0, - buffer, - kBufferSize, - &bytes_needed)); + EXPECT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + monitor2->pfnXcvDataPort(xcv_handle, kXcvDataItem, NULL, 0, buffer, + kBufferSize, &bytes_needed)); EXPECT_TRUE(monitor2->pfnXcvClosePort != NULL); EXPECT_TRUE(monitor2->pfnXcvClosePort(xcv_handle)); @@ -256,7 +246,7 @@ TEST_F(PortMonitorTest, FlowTest) { buffer, kBufferSize, &bytes_processed)); - EXPECT_EQ(0, bytes_processed); + EXPECT_EQ(0u, bytes_processed); EXPECT_FALSE(monitor2->pfnReadPort(port_handle, buffer, sizeof(buffer), |