| Index: net/base/ip_address_number.cc
|
| diff --git a/net/base/ip_address_number.cc b/net/base/ip_address_number.cc
|
| index 1cbf5d4772b6645cb5ac92775bdce0b177b9ca55..06fc3ac29fba3925ff3ebeea7ff01c32e7848208 100644
|
| --- a/net/base/ip_address_number.cc
|
| +++ b/net/base/ip_address_number.cc
|
| @@ -92,8 +92,7 @@ bool IsIPAddressReserved(const IPAddressNumber& host_addr) {
|
| return false;
|
| }
|
|
|
| -std::string IPAddressToString(const uint8* address,
|
| - size_t address_len) {
|
| +std::string IPAddressToString(const uint8_t* address, size_t address_len) {
|
| std::string str;
|
| url::StdStringCanonOutput output(&str);
|
|
|
| @@ -109,9 +108,9 @@ std::string IPAddressToString(const uint8* address,
|
| return str;
|
| }
|
|
|
| -std::string IPAddressToStringWithPort(const uint8* address,
|
| +std::string IPAddressToStringWithPort(const uint8_t* address,
|
| size_t address_len,
|
| - uint16 port) {
|
| + uint16_t port) {
|
| std::string address_str = IPAddressToString(address, address_len);
|
|
|
| if (address_len == kIPv6AddressSize) {
|
| @@ -126,7 +125,7 @@ std::string IPAddressToString(const IPAddressNumber& addr) {
|
| }
|
|
|
| std::string IPAddressToStringWithPort(const IPAddressNumber& addr,
|
| - uint16 port) {
|
| + uint16_t port) {
|
| return IPAddressToStringWithPort(&addr.front(), addr.size(), port);
|
| }
|
|
|
|
|