Index: net/quic/quic_socket_address_coder.cc |
diff --git a/net/quic/quic_socket_address_coder.cc b/net/quic/quic_socket_address_coder.cc |
index 3d0031d188f8b92d33fd18e0c39a62edf3301627..bd28353e8640fc19d8cd6fd6169d8b7ee635b21b 100644 |
--- a/net/quic/quic_socket_address_coder.cc |
+++ b/net/quic/quic_socket_address_coder.cc |
@@ -14,8 +14,8 @@ namespace { |
// For convenience, the values of these constants match the values of AF_INET |
// and AF_INET6 on Linux. |
-const uint16 kIPv4 = 2; |
-const uint16 kIPv6 = 10; |
+const uint16_t kIPv4 = 2; |
+const uint16_t kIPv6 = 10; |
} // namespace |
@@ -28,7 +28,7 @@ QuicSocketAddressCoder::~QuicSocketAddressCoder() {} |
string QuicSocketAddressCoder::Encode() const { |
string serialized; |
- uint16 address_family; |
+ uint16_t address_family; |
switch (address_.GetSockAddrFamily()) { |
case AF_INET: |
address_family = kIPv4; |
@@ -42,13 +42,13 @@ string QuicSocketAddressCoder::Encode() const { |
serialized.append(reinterpret_cast<const char*>(&address_family), |
sizeof(address_family)); |
serialized.append(IPAddressToPackedString(address_.address())); |
- uint16 port = address_.port(); |
+ uint16_t port = address_.port(); |
serialized.append(reinterpret_cast<const char*>(&port), sizeof(port)); |
return serialized; |
} |
bool QuicSocketAddressCoder::Decode(const char* data, size_t length) { |
- uint16 address_family; |
+ uint16_t address_family; |
if (length < sizeof(address_family)) { |
return false; |
} |
@@ -75,7 +75,7 @@ bool QuicSocketAddressCoder::Decode(const char* data, size_t length) { |
data += ip_length; |
length -= ip_length; |
- uint16 port; |
+ uint16_t port; |
if (length != sizeof(port)) { |
return false; |
} |