diff options
| author | Peter Kasting <pkasting@google.com> | 2014-11-20 15:14:08 -0800 |
|---|---|---|
| committer | Peter Kasting <pkasting@google.com> | 2014-11-20 23:16:57 +0000 |
| commit | be940e9e152e528fc567c4eeeeb5930710873f98 (patch) | |
| tree | 8496f9708b39b9ed106be20043e2e37d6ab58eb0 /net/socket | |
| parent | ce6760690b52af662b5684f24dca6edc20832edf (diff) | |
| download | chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.zip chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.tar.gz chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.tar.bz2 | |
Enable MSVC warning for unused locals.
There is seemingly a bug in the compiler where it occasionally claims a local is
unused when it isn't. This forces a few places to either inline such locals or
mark them ALLOW_UNUSED_LOCAL.
BUG=81439
TEST=none
R=brettw@chromium.org, cpu@chromium.org, jamesr@chromium.org, rvargas@chromium.org, sievers@chromium.org, sky@chromium.org, vitalybuka@chromium.org, wolenetz@chromium.org
Review URL: https://codereview.chromium.org/731373002
Cr-Commit-Position: refs/heads/master@{#305108}
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/socks5_client_socket_unittest.cc | 2 | ||||
| -rw-r--r-- | net/socket/socks_client_socket_unittest.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc index c474a0b..5bcc146 100644 --- a/net/socket/socks5_client_socket_unittest.cc +++ b/net/socket/socks5_client_socket_unittest.cc @@ -258,7 +258,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { const char partial1[] = { 0x05, 0x01 }; const char partial2[] = { 0x00 }; MockWrite data_writes[] = { - MockWrite(ASYNC, arraysize(partial1)), + MockWrite(ASYNC, partial1, arraysize(partial1)), MockWrite(ASYNC, partial2, arraysize(partial2)), MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) }; MockRead data_reads[] = { diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index fbb84f8..01bffe6 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -287,12 +287,12 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { const char kSOCKSPartialRequest2[] = { 0x00, 0x50, 127, 0, 0, 1, 0 }; MockWrite data_writes[] = { - MockWrite(ASYNC, arraysize(kSOCKSPartialRequest1)), + MockWrite(ASYNC, kSOCKSPartialRequest1, arraysize(kSOCKSPartialRequest1)), // simulate some empty writes MockWrite(ASYNC, 0), MockWrite(ASYNC, 0), - MockWrite(ASYNC, kSOCKSPartialRequest2, - arraysize(kSOCKSPartialRequest2)) }; + MockWrite(ASYNC, kSOCKSPartialRequest2, arraysize(kSOCKSPartialRequest2)), + }; MockRead data_reads[] = { MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)) }; CapturingNetLog log; |