| Index: webrtc/base/stream.h
|
| diff --git a/webrtc/base/stream.h b/webrtc/base/stream.h
|
| index b3317663b5e3327cf4fc45ce06383aca9339ba8b..c57daae76c591ba83709da6c134317cd4b0237f4 100644
|
| --- a/webrtc/base/stream.h
|
| +++ b/webrtc/base/stream.h
|
| @@ -228,7 +228,7 @@ class StreamInterface : public MessageHandler {
|
| void OnMessage(Message* msg) override;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(StreamInterface);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(StreamInterface);
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -305,7 +305,7 @@ class StreamAdapterInterface : public StreamInterface,
|
| private:
|
| StreamInterface* stream_;
|
| bool owned_;
|
| - DISALLOW_COPY_AND_ASSIGN(StreamAdapterInterface);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(StreamAdapterInterface);
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -337,7 +337,7 @@ class StreamTap : public StreamAdapterInterface {
|
| scoped_ptr<StreamInterface> tap_;
|
| StreamResult tap_result_;
|
| int tap_error_;
|
| - DISALLOW_COPY_AND_ASSIGN(StreamTap);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(StreamTap);
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -415,7 +415,7 @@ class FileStream : public StreamInterface {
|
| FILE* file_;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(FileStream);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(FileStream);
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -458,7 +458,7 @@ class MemoryStreamBase : public StreamInterface {
|
| size_t seek_position_;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(MemoryStreamBase);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(MemoryStreamBase);
|
| };
|
|
|
| // MemoryStream dynamically resizes to accomodate written data.
|
| @@ -556,7 +556,7 @@ class FifoBuffer : public StreamInterface {
|
| size_t read_position_; // offset to the readable data
|
| Thread* owner_; // stream callbacks are dispatched on this thread
|
| mutable CriticalSection crit_; // object lock
|
| - DISALLOW_COPY_AND_ASSIGN(FifoBuffer);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(FifoBuffer);
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -587,7 +587,7 @@ class LoggingAdapter : public StreamAdapterInterface {
|
| bool hex_mode_;
|
| LogMultilineState lms_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(LoggingAdapter);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(LoggingAdapter);
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -670,7 +670,7 @@ class StreamReference : public StreamAdapterInterface {
|
| StreamInterface* stream_;
|
| int ref_count_;
|
| CriticalSection cs_;
|
| - DISALLOW_COPY_AND_ASSIGN(StreamRefCount);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(StreamRefCount);
|
| };
|
|
|
| // Constructor for adding references
|
| @@ -678,7 +678,7 @@ class StreamReference : public StreamAdapterInterface {
|
| StreamInterface* stream);
|
|
|
| StreamRefCount* stream_ref_count_;
|
| - DISALLOW_COPY_AND_ASSIGN(StreamReference);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(StreamReference);
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|