| Index: jingle/glue/utils.h
|
| ===================================================================
|
| --- jingle/glue/utils.h (revision 287594)
|
| +++ jingle/glue/utils.h (working copy)
|
| @@ -11,9 +11,9 @@
|
| class IPEndPoint;
|
| } // namespace net
|
|
|
| -namespace talk_base {
|
| +namespace rtc {
|
| class SocketAddress;
|
| -} // namespace talk_base
|
| +} // namespace rtc
|
|
|
| namespace cricket {
|
| class Candidate;
|
| @@ -25,8 +25,8 @@
|
| // following two functions are used to convert addresses from one
|
| // representation to another.
|
| bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint,
|
| - talk_base::SocketAddress* address);
|
| -bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address,
|
| + rtc::SocketAddress* address);
|
| +bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address,
|
| net::IPEndPoint* ip_endpoint);
|
|
|
| // Helper functions to serialize and deserialize P2P candidates.
|
|
|