Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(525)

Unified Diff: net/socket/socks_client_socket.cc

Issue 826973002: replace COMPILE_ASSERT with static_assert in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply fixups 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/spdy/spdy_http_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socks_client_socket.cc
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
index ecf717f2a88f5184d8344d4c01e9b1b254bafde0..75eb36a76d73d8a9b6968ea6b31810a2d6effd22 100644
--- a/net/socket/socks_client_socket.cc
+++ b/net/socket/socks_client_socket.cc
@@ -44,8 +44,8 @@ struct SOCKS4ServerRequest {
uint16 nw_port;
uint8 ip[4];
};
-COMPILE_ASSERT(sizeof(SOCKS4ServerRequest) == kWriteHeaderSize,
- socks4_server_request_struct_wrong_size);
+static_assert(sizeof(SOCKS4ServerRequest) == kWriteHeaderSize,
+ "socks4 server request struct has incorrect size");
// A struct holding details of the SOCKS4 Server Response.
struct SOCKS4ServerResponse {
@@ -54,8 +54,8 @@ struct SOCKS4ServerResponse {
uint16 port;
uint8 ip[4];
};
-COMPILE_ASSERT(sizeof(SOCKS4ServerResponse) == kReadHeaderSize,
- socks4_server_response_struct_wrong_size);
+static_assert(sizeof(SOCKS4ServerResponse) == kReadHeaderSize,
+ "socks4 server response struct has incorrect size");
SOCKSClientSocket::SOCKSClientSocket(
scoped_ptr<ClientSocketHandle> transport_socket,
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/spdy/spdy_http_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698