net/socket/socks5_client_socket.cc - Issue 862133002: Update from https://crrev.com/312398

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/socks5_client_socket.cc

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/socket/socks5_client_socket.cc

diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc

index 681f73f26e983f824567c7a2561d72fc10d6fe64..b435e1354260534762d07bc915700142725aa8fa 100644

--- a/net/socket/socks5_client_socket.cc

+++ b/net/socket/socks5_client_socket.cc

@@ -25,8 +25,8 @@ const uint8 SOCKS5ClientSocket::kSOCKS5Version = 0x05;

const uint8 SOCKS5ClientSocket::kTunnelCommand = 0x01;

const uint8 SOCKS5ClientSocket::kNullByte = 0x00;

-COMPILE_ASSERT(sizeof(struct in_addr) == 4, incorrect_system_size_of_IPv4);

-COMPILE_ASSERT(sizeof(struct in6_addr) == 16, incorrect_system_size_of_IPv6);

+static_assert(sizeof(struct in_addr) == 4, "incorrect system size of IPv4");

+static_assert(sizeof(struct in6_addr) == 16, "incorrect system size of IPv6");

SOCKS5ClientSocket::SOCKS5ClientSocket(

scoped_ptr<ClientSocketHandle> transport_socket,