| Index: webrtc/base/proxyserver.h
|
| diff --git a/webrtc/base/proxyserver.h b/webrtc/base/proxyserver.h
|
| index 711ed55bf881c4de64d325041bd2acdf5b12d93a..adb26ae9d046f8befe3a88fdb2a627d5849e6fff 100644
|
| --- a/webrtc/base/proxyserver.h
|
| +++ b/webrtc/base/proxyserver.h
|
| @@ -55,7 +55,7 @@ class ProxyBinding : public sigslot::has_slots<> {
|
| bool connected_;
|
| FifoBuffer out_buffer_;
|
| FifoBuffer in_buffer_;
|
| - DISALLOW_COPY_AND_ASSIGN(ProxyBinding);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(ProxyBinding);
|
| };
|
|
|
| class ProxyServer : public sigslot::has_slots<> {
|
| @@ -78,7 +78,7 @@ class ProxyServer : public sigslot::has_slots<> {
|
| SocketAddress ext_ip_;
|
| scoped_ptr<AsyncSocket> server_socket_;
|
| BindingList bindings_;
|
| - DISALLOW_COPY_AND_ASSIGN(ProxyServer);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(ProxyServer);
|
| };
|
|
|
| // SocksProxyServer is a simple extension of ProxyServer to implement SOCKS.
|
| @@ -90,7 +90,7 @@ class SocksProxyServer : public ProxyServer {
|
| }
|
| protected:
|
| AsyncProxyServerSocket* WrapSocket(AsyncSocket* socket) override;
|
| - DISALLOW_COPY_AND_ASSIGN(SocksProxyServer);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(SocksProxyServer);
|
| };
|
|
|
| } // namespace rtc
|
|
|