| Index: net/base/ip_endpoint.h
|
| diff --git a/net/base/ip_endpoint.h b/net/base/ip_endpoint.h
|
| index 07ef3841d1e7303ca67e5289324dff32d68b29c3..34b378bdda365d1b16c9ba08743d36ae908f8f07 100644
|
| --- a/net/base/ip_endpoint.h
|
| +++ b/net/base/ip_endpoint.h
|
| @@ -11,7 +11,7 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "net/base/address_family.h"
|
| -#include "net/base/ip_address_number.h"
|
| +#include "net/base/ip_address.h"
|
| #include "net/base/net_export.h"
|
| #include "net/base/sys_addrinfo.h"
|
|
|
| @@ -19,8 +19,6 @@ struct sockaddr;
|
|
|
| namespace net {
|
|
|
| -class IPAddress;
|
| -
|
| // An IPEndPoint represents the address of a transport endpoint:
|
| // * IP address (either v4 or v6)
|
| // * Port
|
| @@ -33,7 +31,7 @@ class NET_EXPORT IPEndPoint {
|
| IPEndPoint(const IPAddress& address, uint16_t port);
|
| IPEndPoint(const IPEndPoint& endpoint);
|
|
|
| - const IPAddressNumber& address() const { return address_; }
|
| + const IPAddress& address() const { return address_; }
|
| uint16_t port() const { return port_; }
|
|
|
| // Returns AddressFamily of the address.
|
| @@ -70,7 +68,7 @@ class NET_EXPORT IPEndPoint {
|
| bool operator==(const IPEndPoint& that) const;
|
|
|
| private:
|
| - IPAddressNumber address_;
|
| + IPAddress address_;
|
| uint16_t port_;
|
| };
|
|
|
|
|