| Index: webrtc/base/socketstream.h
|
| diff --git a/webrtc/base/socketstream.h b/webrtc/base/socketstream.h
|
| index a1f8ad930672e9d88cd312cdd4603cdbbe8519ff..a76ffb38143ca88f37de645320b23d85644a1751 100644
|
| --- a/webrtc/base/socketstream.h
|
| +++ b/webrtc/base/socketstream.h
|
| @@ -11,51 +11,9 @@
|
| #ifndef WEBRTC_BASE_SOCKETSTREAM_H_
|
| #define WEBRTC_BASE_SOCKETSTREAM_H_
|
|
|
| -#include "webrtc/base/asyncsocket.h"
|
| -#include "webrtc/base/constructormagic.h"
|
| -#include "webrtc/base/stream.h"
|
|
|
| -namespace rtc {
|
| -
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -
|
| -class SocketStream : public StreamInterface, public sigslot::has_slots<> {
|
| - public:
|
| - explicit SocketStream(AsyncSocket* socket);
|
| - ~SocketStream() override;
|
| -
|
| - void Attach(AsyncSocket* socket);
|
| - AsyncSocket* Detach();
|
| -
|
| - AsyncSocket* GetSocket() { return socket_; }
|
| -
|
| - StreamState GetState() const override;
|
| -
|
| - StreamResult Read(void* buffer,
|
| - size_t buffer_len,
|
| - size_t* read,
|
| - int* error) override;
|
| -
|
| - StreamResult Write(const void* data,
|
| - size_t data_len,
|
| - size_t* written,
|
| - int* error) override;
|
| -
|
| - void Close() override;
|
| -
|
| - private:
|
| - void OnConnectEvent(AsyncSocket* socket);
|
| - void OnReadEvent(AsyncSocket* socket);
|
| - void OnWriteEvent(AsyncSocket* socket);
|
| - void OnCloseEvent(AsyncSocket* socket, int err);
|
| -
|
| - AsyncSocket* socket_;
|
| -
|
| - RTC_DISALLOW_COPY_AND_ASSIGN(SocketStream);
|
| -};
|
| -
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -
|
| -} // namespace rtc
|
| +// This header is deprecated and is just left here temporarily during
|
| +// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
| +#include "webrtc/rtc_base/socketstream.h"
|
|
|
| #endif // WEBRTC_BASE_SOCKETSTREAM_H_
|
|
|