diff --git a/talk/app/webrtc/dtmfsender.h b/talk/app/webrtc/dtmfsender.h index ec9a36ef2d..6d23610c7d 100644 --- a/talk/app/webrtc/dtmfsender.h +++ b/talk/app/webrtc/dtmfsender.h @@ -116,7 +116,7 @@ class DtmfSender int duration_; int inter_tone_gap_; - DISALLOW_COPY_AND_ASSIGN(DtmfSender); + RTC_DISALLOW_COPY_AND_ASSIGN(DtmfSender); }; // Define proxy for DtmfSenderInterface. diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h index 625486fadb..c270439377 100644 --- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h +++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h @@ -102,7 +102,7 @@ private: static jobject application_context_; - DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni); + RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni); }; } // namespace webrtc_jni diff --git a/talk/app/webrtc/jsepicecandidate.h b/talk/app/webrtc/jsepicecandidate.h index ad3b33809a..1d5ef1997f 100644 --- a/talk/app/webrtc/jsepicecandidate.h +++ b/talk/app/webrtc/jsepicecandidate.h @@ -63,7 +63,7 @@ class JsepIceCandidate : public IceCandidateInterface { int sdp_mline_index_; cricket::Candidate candidate_; - DISALLOW_COPY_AND_ASSIGN(JsepIceCandidate); + RTC_DISALLOW_COPY_AND_ASSIGN(JsepIceCandidate); }; // Implementation of IceCandidateCollection. diff --git a/talk/app/webrtc/jsepsessiondescription.h b/talk/app/webrtc/jsepsessiondescription.h index 53f4e06388..756352c240 100644 --- a/talk/app/webrtc/jsepsessiondescription.h +++ b/talk/app/webrtc/jsepsessiondescription.h @@ -98,7 +98,7 @@ class JsepSessionDescription : public SessionDescriptionInterface { bool GetMediasectionIndex(const IceCandidateInterface* candidate, size_t* index); - DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); + RTC_DISALLOW_COPY_AND_ASSIGN(JsepSessionDescription); }; } // namespace webrtc diff --git a/talk/app/webrtc/mediacontroller.cc b/talk/app/webrtc/mediacontroller.cc index d8c9b52095..ff21314689 100644 --- a/talk/app/webrtc/mediacontroller.cc +++ b/talk/app/webrtc/mediacontroller.cc @@ -74,7 +74,7 @@ class MediaController : public webrtc::MediaControllerInterface { rtc::Thread* worker_thread_; rtc::scoped_ptr call_; - DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController); }; } // namespace { diff --git a/talk/app/webrtc/remotevideocapturer.h b/talk/app/webrtc/remotevideocapturer.h index 1bb4d07bdd..1429ffb9cc 100644 --- a/talk/app/webrtc/remotevideocapturer.h +++ b/talk/app/webrtc/remotevideocapturer.h @@ -57,7 +57,7 @@ class RemoteVideoCapturer : public cricket::VideoCapturer { bool IsScreencast() const override; private: - DISALLOW_COPY_AND_ASSIGN(RemoteVideoCapturer); + RTC_DISALLOW_COPY_AND_ASSIGN(RemoteVideoCapturer); }; } // namespace webrtc diff --git a/talk/app/webrtc/statstypes.h b/talk/app/webrtc/statstypes.h index 156e784acf..5d5d7174c3 100644 --- a/talk/app/webrtc/statstypes.h +++ b/talk/app/webrtc/statstypes.h @@ -321,7 +321,7 @@ class StatsReport { } value_; private: - DISALLOW_COPY_AND_ASSIGN(Value); + RTC_DISALLOW_COPY_AND_ASSIGN(Value); }; // TODO(tommi): Consider using a similar approach to how we store Ids using @@ -371,7 +371,7 @@ class StatsReport { double timestamp_; // Time since 1970-01-01T00:00:00Z in milliseconds. Values values_; - DISALLOW_COPY_AND_ASSIGN(StatsReport); + RTC_DISALLOW_COPY_AND_ASSIGN(StatsReport); }; // Typedef for an array of const StatsReport pointers. diff --git a/talk/app/webrtc/videosource.cc b/talk/app/webrtc/videosource.cc index bb27b10bcd..4c56f9500b 100644 --- a/talk/app/webrtc/videosource.cc +++ b/talk/app/webrtc/videosource.cc @@ -321,7 +321,7 @@ class FrameInputWrapper : public cricket::VideoRenderer { int width_; int height_; - DISALLOW_COPY_AND_ASSIGN(FrameInputWrapper); + RTC_DISALLOW_COPY_AND_ASSIGN(FrameInputWrapper); }; } // anonymous namespace diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h index 3c70b02e0e..582d6d0bd5 100644 --- a/talk/app/webrtc/webrtcsession.h +++ b/talk/app/webrtc/webrtcsession.h @@ -107,7 +107,7 @@ class IceObserver { ~IceObserver() {} private: - DISALLOW_COPY_AND_ASSIGN(IceObserver); + RTC_DISALLOW_COPY_AND_ASSIGN(IceObserver); }; class WebRtcSession : public cricket::BaseSession, @@ -414,7 +414,7 @@ class WebRtcSession : public cricket::BaseSession, // Declares the RTCP mux policy for the WebRTCSession. PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; - DISALLOW_COPY_AND_ASSIGN(WebRtcSession); + RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); }; } // namespace webrtc diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.h b/talk/app/webrtc/webrtcsessiondescriptionfactory.h index 8abf6aaa26..b42a551ef2 100644 --- a/talk/app/webrtc/webrtcsessiondescriptionfactory.h +++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.h @@ -197,7 +197,7 @@ class WebRtcSessionDescriptionFactory : public rtc::MessageHandler, const cricket::DataChannelType data_channel_type_; CertificateRequestState certificate_request_state_; - DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); + RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); }; } // namespace webrtc diff --git a/talk/media/base/cpuid.h b/talk/media/base/cpuid.h index 310b221626..04d1b7b3aa 100644 --- a/talk/media/base/cpuid.h +++ b/talk/media/base/cpuid.h @@ -28,7 +28,7 @@ #ifndef TALK_MEDIA_BASE_CPUID_H_ #define TALK_MEDIA_BASE_CPUID_H_ -#include "webrtc/base/basictypes.h" // For DISALLOW_IMPLICIT_CONSTRUCTORS +#include "webrtc/base/basictypes.h" // For RTC_DISALLOW_IMPLICIT_CONSTRUCTORS namespace cricket { @@ -65,7 +65,7 @@ class CpuInfo { static void MaskCpuFlagsForTest(int enable_flags); private: - DISALLOW_IMPLICIT_CONSTRUCTORS(CpuInfo); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CpuInfo); }; // Detect an Intel Core I5 or better such as 4th generation Macbook Air. diff --git a/talk/media/base/rtpdump.h b/talk/media/base/rtpdump.h index 33c31c9837..ce85db1e06 100644 --- a/talk/media/base/rtpdump.h +++ b/talk/media/base/rtpdump.h @@ -133,7 +133,7 @@ class RtpDumpReader { uint32 start_time_ms_; uint32 ssrc_override_; - DISALLOW_COPY_AND_ASSIGN(RtpDumpReader); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpDumpReader); }; // RtpDumpLoopReader reads RTP dump packets from the input stream and rewinds @@ -181,7 +181,7 @@ class RtpDumpLoopReader : public RtpDumpReader { int prev_rtp_seq_num_; uint32 prev_rtp_timestamp_; - DISALLOW_COPY_AND_ASSIGN(RtpDumpLoopReader); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpDumpLoopReader); }; class RtpDumpWriter { @@ -225,7 +225,7 @@ class RtpDumpWriter { uint32 start_time_ms_; // Time when the record starts. // If writing to the stream takes longer than this many ms, log a warning. uint32 warn_slow_writes_delay_; - DISALLOW_COPY_AND_ASSIGN(RtpDumpWriter); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpDumpWriter); }; } // namespace cricket diff --git a/talk/media/base/streamparams.h b/talk/media/base/streamparams.h index a45289413f..e5d0177822 100644 --- a/talk/media/base/streamparams.h +++ b/talk/media/base/streamparams.h @@ -246,7 +246,7 @@ struct MediaStreams { std::vector video_; std::vector data_; - DISALLOW_COPY_AND_ASSIGN(MediaStreams); + RTC_DISALLOW_COPY_AND_ASSIGN(MediaStreams); }; // A request for a specific format of a specific stream. diff --git a/talk/media/base/videoadapter.h b/talk/media/base/videoadapter.h index 58d2f03e98..4c863b33f6 100644 --- a/talk/media/base/videoadapter.h +++ b/talk/media/base/videoadapter.h @@ -92,7 +92,7 @@ class VideoAdapter { // The critical section to protect the above variables. rtc::CriticalSection critical_section_; - DISALLOW_COPY_AND_ASSIGN(VideoAdapter); + RTC_DISALLOW_COPY_AND_ASSIGN(VideoAdapter); }; // CoordinatedVideoAdapter adapts the video input to the encoder by coordinating @@ -201,7 +201,7 @@ class CoordinatedVideoAdapter // adaptation is on), but only used if cpu_smoothing_ is set. float system_load_average_; - DISALLOW_COPY_AND_ASSIGN(CoordinatedVideoAdapter); + RTC_DISALLOW_COPY_AND_ASSIGN(CoordinatedVideoAdapter); }; } // namespace cricket diff --git a/talk/media/base/videocapturer.h b/talk/media/base/videocapturer.h index df9cf7f06c..95cb9e95f5 100644 --- a/talk/media/base/videocapturer.h +++ b/talk/media/base/videocapturer.h @@ -104,7 +104,7 @@ struct CapturedFrame { // memory or points to an existing memory. private: - DISALLOW_COPY_AND_ASSIGN(CapturedFrame); + RTC_DISALLOW_COPY_AND_ASSIGN(CapturedFrame); }; // VideoCapturer is an abstract class that defines the interfaces for video @@ -397,7 +397,7 @@ class VideoCapturer // Whether capturer should apply rotation to the frame before signaling it. bool apply_rotation_; - DISALLOW_COPY_AND_ASSIGN(VideoCapturer); + RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); }; } // namespace cricket diff --git a/talk/media/base/yuvframegenerator.h b/talk/media/base/yuvframegenerator.h index b47be64640..27ea2e841b 100644 --- a/talk/media/base/yuvframegenerator.h +++ b/talk/media/base/yuvframegenerator.h @@ -97,7 +97,7 @@ class YuvFrameGenerator { int barcode_start_x_; int barcode_start_y_; - DISALLOW_COPY_AND_ASSIGN(YuvFrameGenerator); + RTC_DISALLOW_COPY_AND_ASSIGN(YuvFrameGenerator); }; } // namespace cricket diff --git a/talk/media/devices/filevideocapturer.cc b/talk/media/devices/filevideocapturer.cc index 96dbcb18f3..6025d6dd40 100644 --- a/talk/media/devices/filevideocapturer.cc +++ b/talk/media/devices/filevideocapturer.cc @@ -150,7 +150,7 @@ class FileVideoCapturer::FileReadThread mutable rtc::CriticalSection crit_; bool finished_; - DISALLOW_COPY_AND_ASSIGN(FileReadThread); + RTC_DISALLOW_COPY_AND_ASSIGN(FileReadThread); }; ///////////////////////////////////////////////////////////////////// diff --git a/talk/media/devices/filevideocapturer.h b/talk/media/devices/filevideocapturer.h index 101b9b9dea..3ef82efed1 100644 --- a/talk/media/devices/filevideocapturer.h +++ b/talk/media/devices/filevideocapturer.h @@ -71,7 +71,7 @@ class VideoRecorder { rtc::FileStream video_file_; bool write_header_; - DISALLOW_COPY_AND_ASSIGN(VideoRecorder); + RTC_DISALLOW_COPY_AND_ASSIGN(VideoRecorder); }; // Simulated video capturer that periodically reads frames from a file. @@ -153,7 +153,7 @@ class FileVideoCapturer : public VideoCapturer { int64 last_frame_timestamp_ns_; // Timestamp of last read frame. bool ignore_framerate_; - DISALLOW_COPY_AND_ASSIGN(FileVideoCapturer); + RTC_DISALLOW_COPY_AND_ASSIGN(FileVideoCapturer); }; } // namespace cricket diff --git a/talk/media/devices/yuvframescapturer.cc b/talk/media/devices/yuvframescapturer.cc index d9b0fc5bd9..7579df170a 100644 --- a/talk/media/devices/yuvframescapturer.cc +++ b/talk/media/devices/yuvframescapturer.cc @@ -88,7 +88,7 @@ class YuvFramesCapturer::YuvFramesThread mutable rtc::CriticalSection crit_; bool finished_; - DISALLOW_COPY_AND_ASSIGN(YuvFramesThread); + RTC_DISALLOW_COPY_AND_ASSIGN(YuvFramesThread); }; ///////////////////////////////////////////////////////////////////// diff --git a/talk/media/devices/yuvframescapturer.h b/talk/media/devices/yuvframescapturer.h index b5d86553e0..08c8470861 100644 --- a/talk/media/devices/yuvframescapturer.h +++ b/talk/media/devices/yuvframescapturer.h @@ -90,7 +90,7 @@ class YuvFramesCapturer : public VideoCapturer { int32 barcode_interval_; int32 GetBarcodeValue(); - DISALLOW_COPY_AND_ASSIGN(YuvFramesCapturer); + RTC_DISALLOW_COPY_AND_ASSIGN(YuvFramesCapturer); }; } // namespace cricket diff --git a/talk/session/media/srtpfilter.h b/talk/session/media/srtpfilter.h index f171f5fe66..a536327fb0 100644 --- a/talk/session/media/srtpfilter.h +++ b/talk/session/media/srtpfilter.h @@ -245,7 +245,7 @@ class SrtpSession { static bool inited_; static rtc::GlobalLockPod lock_; int last_send_seq_num_; - DISALLOW_COPY_AND_ASSIGN(SrtpSession); + RTC_DISALLOW_COPY_AND_ASSIGN(SrtpSession); }; // Class that collects failures of SRTP. @@ -320,7 +320,7 @@ class SrtpStat { // Threshold in ms to silent the signaling errors. uint32 signal_silent_time_; - DISALLOW_COPY_AND_ASSIGN(SrtpStat); + RTC_DISALLOW_COPY_AND_ASSIGN(SrtpStat); }; } // namespace cricket diff --git a/talk/session/media/srtpfilter_unittest.cc b/talk/session/media/srtpfilter_unittest.cc index d8174a978a..4cbcb4afd4 100644 --- a/talk/session/media/srtpfilter_unittest.cc +++ b/talk/session/media/srtpfilter_unittest.cc @@ -797,7 +797,7 @@ class SrtpStatTest cricket::SrtpFilter::Error error_; private: - DISALLOW_COPY_AND_ASSIGN(SrtpStatTest); + RTC_DISALLOW_COPY_AND_ASSIGN(SrtpStatTest); }; TEST_F(SrtpStatTest, TestProtectRtpError) { diff --git a/webrtc/base/asyncinvoker.h b/webrtc/base/asyncinvoker.h index e0264be208..2d2c65c7a2 100644 --- a/webrtc/base/asyncinvoker.h +++ b/webrtc/base/asyncinvoker.h @@ -141,7 +141,7 @@ class AsyncInvoker : public MessageHandler { uint32 id); bool destroying_; - DISALLOW_COPY_AND_ASSIGN(AsyncInvoker); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncInvoker); }; // Similar to AsyncInvoker, but guards against the Thread being destroyed while diff --git a/webrtc/base/asyncpacketsocket.h b/webrtc/base/asyncpacketsocket.h index 0affd245d4..f0c221da1d 100644 --- a/webrtc/base/asyncpacketsocket.h +++ b/webrtc/base/asyncpacketsocket.h @@ -130,7 +130,7 @@ class AsyncPacketSocket : public sigslot::has_slots<> { sigslot::signal2 SignalNewConnection; private: - DISALLOW_COPY_AND_ASSIGN(AsyncPacketSocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncPacketSocket); }; } // namespace rtc diff --git a/webrtc/base/asynctcpsocket.h b/webrtc/base/asynctcpsocket.h index 64355101fb..321fa23493 100644 --- a/webrtc/base/asynctcpsocket.h +++ b/webrtc/base/asynctcpsocket.h @@ -74,7 +74,7 @@ class AsyncTCPSocketBase : public AsyncPacketSocket { char* inbuf_, * outbuf_; size_t insize_, inpos_, outsize_, outpos_; - DISALLOW_COPY_AND_ASSIGN(AsyncTCPSocketBase); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncTCPSocketBase); }; class AsyncTCPSocket : public AsyncTCPSocketBase { @@ -95,7 +95,7 @@ class AsyncTCPSocket : public AsyncTCPSocketBase { void HandleIncomingConnection(AsyncSocket* socket) override; private: - DISALLOW_COPY_AND_ASSIGN(AsyncTCPSocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncTCPSocket); }; } // namespace rtc diff --git a/webrtc/base/autodetectproxy.h b/webrtc/base/autodetectproxy.h index b9887bceb3..1bd523f8db 100644 --- a/webrtc/base/autodetectproxy.h +++ b/webrtc/base/autodetectproxy.h @@ -81,7 +81,7 @@ class AutoDetectProxy : public SignalThread { AsyncSocket* socket_; int next_; - DISALLOW_IMPLICIT_CONSTRUCTORS(AutoDetectProxy); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AutoDetectProxy); }; } // namespace rtc diff --git a/webrtc/base/bitbuffer.h b/webrtc/base/bitbuffer.h index 4f9ed3c3cd..7202675a44 100644 --- a/webrtc/base/bitbuffer.h +++ b/webrtc/base/bitbuffer.h @@ -81,7 +81,7 @@ class BitBuffer { // The current offset, in bits, into the current byte. size_t bit_offset_; - DISALLOW_COPY_AND_ASSIGN(BitBuffer); + RTC_DISALLOW_COPY_AND_ASSIGN(BitBuffer); }; // A BitBuffer API for write operations. Supports symmetric write APIs to the @@ -110,7 +110,7 @@ class BitBufferWriter : public BitBuffer { // The buffer, as a writable array. uint8_t* const writable_bytes_; - DISALLOW_COPY_AND_ASSIGN(BitBufferWriter); + RTC_DISALLOW_COPY_AND_ASSIGN(BitBufferWriter); }; } // namespace rtc diff --git a/webrtc/base/bufferqueue.h b/webrtc/base/bufferqueue.h index 4adae416ad..4941fccf2e 100644 --- a/webrtc/base/bufferqueue.h +++ b/webrtc/base/bufferqueue.h @@ -42,7 +42,7 @@ class BufferQueue { std::vector free_list_; mutable CriticalSection crit_; // object lock - DISALLOW_COPY_AND_ASSIGN(BufferQueue); + RTC_DISALLOW_COPY_AND_ASSIGN(BufferQueue); }; } // namespace rtc diff --git a/webrtc/base/bytebuffer.h b/webrtc/base/bytebuffer.h index c4632f50b7..6cab2a829f 100644 --- a/webrtc/base/bytebuffer.h +++ b/webrtc/base/bytebuffer.h @@ -114,7 +114,7 @@ class ByteBuffer { // There are sensible ways to define these, but they aren't needed in our code // base. - DISALLOW_COPY_AND_ASSIGN(ByteBuffer); + RTC_DISALLOW_COPY_AND_ASSIGN(ByteBuffer); }; } // namespace rtc diff --git a/webrtc/base/constructormagic.h b/webrtc/base/constructormagic.h index 6b1244fc64..c234d40d7e 100644 --- a/webrtc/base/constructormagic.h +++ b/webrtc/base/constructormagic.h @@ -11,19 +11,14 @@ #ifndef WEBRTC_BASE_CONSTRUCTORMAGIC_H_ #define WEBRTC_BASE_CONSTRUCTORMAGIC_H_ -// Undefine macros first, just in case. Some third-party includes have their own -// version. - -#undef DISALLOW_ASSIGN -#define DISALLOW_ASSIGN(TypeName) \ +#define RTC_DISALLOW_ASSIGN(TypeName) \ void operator=(const TypeName&) // A macro to disallow the evil copy constructor and operator= functions // This should be used in the private: declarations for a class. -#undef DISALLOW_COPY_AND_ASSIGN -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&); \ - DISALLOW_ASSIGN(TypeName) +#define RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) \ + TypeName(const TypeName&); \ + RTC_DISALLOW_ASSIGN(TypeName) // A macro to disallow all the implicit constructors, namely the // default constructor, copy constructor and operator= functions. @@ -31,10 +26,8 @@ // This should be used in the private: declarations for a class // that wants to prevent anyone from instantiating it. This is // especially useful for classes containing only static methods. -#undef DISALLOW_IMPLICIT_CONSTRUCTORS -#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ - TypeName(); \ - DISALLOW_COPY_AND_ASSIGN(TypeName) - +#define RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ + TypeName(); \ + RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) #endif // WEBRTC_BASE_CONSTRUCTORMAGIC_H_ diff --git a/webrtc/base/criticalsection.h b/webrtc/base/criticalsection.h index 46a4f3408b..241d611a07 100644 --- a/webrtc/base/criticalsection.h +++ b/webrtc/base/criticalsection.h @@ -72,7 +72,7 @@ class SCOPED_LOCKABLE CritScope { ~CritScope() UNLOCK_FUNCTION(); private: CriticalSection* const cs_; - DISALLOW_COPY_AND_ASSIGN(CritScope); + RTC_DISALLOW_COPY_AND_ASSIGN(CritScope); }; // Tries to lock a critical section on construction via @@ -95,7 +95,7 @@ class TryCritScope { CriticalSection* const cs_; const bool locked_; CS_DEBUG_CODE(mutable bool lock_was_called_); - DISALLOW_COPY_AND_ASSIGN(TryCritScope); + RTC_DISALLOW_COPY_AND_ASSIGN(TryCritScope); }; // A POD lock used to protect global variables. Do NOT use for other purposes. @@ -121,7 +121,7 @@ class SCOPED_LOCKABLE GlobalLockScope { ~GlobalLockScope() UNLOCK_FUNCTION(); private: GlobalLockPod* const lock_; - DISALLOW_COPY_AND_ASSIGN(GlobalLockScope); + RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope); }; } // namespace rtc diff --git a/webrtc/base/filerotatingstream.h b/webrtc/base/filerotatingstream.h index f3de14ede4..9e8e35ddd7 100644 --- a/webrtc/base/filerotatingstream.h +++ b/webrtc/base/filerotatingstream.h @@ -123,7 +123,7 @@ class FileRotatingStream : public StreamInterface { size_t current_bytes_written_; bool disable_buffering_; - DISALLOW_COPY_AND_ASSIGN(FileRotatingStream); + RTC_DISALLOW_COPY_AND_ASSIGN(FileRotatingStream); }; // CallSessionFileRotatingStream is meant to be used in situations where we will @@ -164,7 +164,7 @@ class CallSessionFileRotatingStream : public FileRotatingStream { const size_t max_total_log_size_; size_t num_rotations_; - DISALLOW_COPY_AND_ASSIGN(CallSessionFileRotatingStream); + RTC_DISALLOW_COPY_AND_ASSIGN(CallSessionFileRotatingStream); }; } // namespace rtc diff --git a/webrtc/base/fileutils.h b/webrtc/base/fileutils.h index 1533fb5c11..8d085ef8ab 100644 --- a/webrtc/base/fileutils.h +++ b/webrtc/base/fileutils.h @@ -407,7 +407,7 @@ class Filesystem { static FilesystemInterface* default_filesystem_; static FilesystemInterface *EnsureDefaultFilesystem(); - DISALLOW_IMPLICIT_CONSTRUCTORS(Filesystem); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Filesystem); }; class FilesystemScope{ @@ -420,7 +420,7 @@ class FilesystemScope{ } private: FilesystemInterface* old_fs_; - DISALLOW_IMPLICIT_CONSTRUCTORS(FilesystemScope); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FilesystemScope); }; // Generates a unique filename based on the input path. If no path component diff --git a/webrtc/base/flags.h b/webrtc/base/flags.h index e500534669..4ce857b74a 100644 --- a/webrtc/base/flags.h +++ b/webrtc/base/flags.h @@ -90,17 +90,17 @@ class Flag { assert(type_ == BOOL); return &variable_->b; } - + int* int_variable() const { assert(type_ == INT); return &variable_->i; } - + double* float_variable() const { assert(type_ == FLOAT); return &variable_->f; } - + const char** string_variable() const { assert(type_ == STRING); return &variable_->s; @@ -111,17 +111,17 @@ class Flag { assert(type_ == BOOL); return default_.b; } - + int int_default() const { assert(type_ == INT); return default_.i; } - + double float_default() const { assert(type_ == FLOAT); return default_.f; } - + const char* string_default() const { assert(type_ == STRING); return default_.s; @@ -261,9 +261,9 @@ class WindowsCommandLineArguments { char **argv_; private: - DISALLOW_COPY_AND_ASSIGN(WindowsCommandLineArguments); + RTC_DISALLOW_COPY_AND_ASSIGN(WindowsCommandLineArguments); }; -#endif // WEBRTC_WIN +#endif // WEBRTC_WIN } // namespace rtc diff --git a/webrtc/base/latebindingsymboltable.h b/webrtc/base/latebindingsymboltable.h index c1f535cd2b..636e7d0707 100644 --- a/webrtc/base/latebindingsymboltable.h +++ b/webrtc/base/latebindingsymboltable.h @@ -61,7 +61,7 @@ class LateBindingSymbolTable { DllHandle handle_; bool undefined_symbols_; - DISALLOW_COPY_AND_ASSIGN(LateBindingSymbolTable); + RTC_DISALLOW_COPY_AND_ASSIGN(LateBindingSymbolTable); }; } // namespace rtc diff --git a/webrtc/base/latebindingsymboltable.h.def b/webrtc/base/latebindingsymboltable.h.def index 39b515fbd1..bc6396b1f0 100644 --- a/webrtc/base/latebindingsymboltable.h.def +++ b/webrtc/base/latebindingsymboltable.h.def @@ -76,7 +76,7 @@ LATE_BINDING_SYMBOL_TABLE_SYMBOLS_LIST void *table_[SYMBOL_TABLE_SIZE]; - DISALLOW_COPY_AND_ASSIGN(LATE_BINDING_SYMBOL_TABLE_CLASS_NAME); + RTC_DISALLOW_COPY_AND_ASSIGN(LATE_BINDING_SYMBOL_TABLE_CLASS_NAME); }; #undef LATE_BINDING_SYMBOL_TABLE_CLASS_NAME diff --git a/webrtc/base/logging.h b/webrtc/base/logging.h index 739bf63128..b8f460c1bd 100644 --- a/webrtc/base/logging.h +++ b/webrtc/base/logging.h @@ -239,7 +239,7 @@ class LogMessage { // Determines if logs will be directed to stderr in debug mode. static bool log_to_stderr_; - DISALLOW_COPY_AND_ASSIGN(LogMessage); + RTC_DISALLOW_COPY_AND_ASSIGN(LogMessage); }; ////////////////////////////////////////////////////////////////////// diff --git a/webrtc/base/logsinks.h b/webrtc/base/logsinks.h index 849e1dcf16..eabf056398 100644 --- a/webrtc/base/logsinks.h +++ b/webrtc/base/logsinks.h @@ -48,7 +48,7 @@ class FileRotatingLogSink : public LogSink { private: scoped_ptr stream_; - DISALLOW_COPY_AND_ASSIGN(FileRotatingLogSink); + RTC_DISALLOW_COPY_AND_ASSIGN(FileRotatingLogSink); }; // Log sink that uses a CallSessionFileRotatingStream to write to disk. @@ -60,7 +60,7 @@ class CallSessionFileRotatingLogSink : public FileRotatingLogSink { ~CallSessionFileRotatingLogSink() override; private: - DISALLOW_COPY_AND_ASSIGN(CallSessionFileRotatingLogSink); + RTC_DISALLOW_COPY_AND_ASSIGN(CallSessionFileRotatingLogSink); }; } // namespace rtc diff --git a/webrtc/base/macasyncsocket.h b/webrtc/base/macasyncsocket.h index a43177de5f..735147443a 100644 --- a/webrtc/base/macasyncsocket.h +++ b/webrtc/base/macasyncsocket.h @@ -90,7 +90,7 @@ class MacAsyncSocket : public AsyncSocket, public sigslot::has_slots<> { ConnState state_; AsyncResolver* resolver_; - DISALLOW_COPY_AND_ASSIGN(MacAsyncSocket); + RTC_DISALLOW_COPY_AND_ASSIGN(MacAsyncSocket); }; } // namespace rtc diff --git a/webrtc/base/maccocoasocketserver.h b/webrtc/base/maccocoasocketserver.h index 906229cbd6..0acf8d757a 100644 --- a/webrtc/base/maccocoasocketserver.h +++ b/webrtc/base/maccocoasocketserver.h @@ -40,7 +40,7 @@ class MacCocoaSocketServer : public MacBaseSocketServer { // The count of how many times we're inside the NSApplication main loop. int run_count_; - DISALLOW_COPY_AND_ASSIGN(MacCocoaSocketServer); + RTC_DISALLOW_COPY_AND_ASSIGN(MacCocoaSocketServer); }; } // namespace rtc diff --git a/webrtc/base/messagehandler.h b/webrtc/base/messagehandler.h index b0a82179a2..df82b4ea9a 100644 --- a/webrtc/base/messagehandler.h +++ b/webrtc/base/messagehandler.h @@ -29,7 +29,7 @@ class MessageHandler { MessageHandler() {} private: - DISALLOW_COPY_AND_ASSIGN(MessageHandler); + RTC_DISALLOW_COPY_AND_ASSIGN(MessageHandler); }; // Helper class to facilitate executing a functor on a thread. diff --git a/webrtc/base/messagequeue.h b/webrtc/base/messagequeue.h index e0cab8f5be..23dbafc124 100644 --- a/webrtc/base/messagequeue.h +++ b/webrtc/base/messagequeue.h @@ -248,7 +248,7 @@ class MessageQueue { mutable CriticalSection crit_; private: - DISALLOW_COPY_AND_ASSIGN(MessageQueue); + RTC_DISALLOW_COPY_AND_ASSIGN(MessageQueue); }; } // namespace rtc diff --git a/webrtc/base/multipart.h b/webrtc/base/multipart.h index 1eeef5ce2d..a099230cc5 100644 --- a/webrtc/base/multipart.h +++ b/webrtc/base/multipart.h @@ -75,7 +75,7 @@ class MultipartStream : public StreamInterface, public sigslot::has_slots<> { size_t current_; // The index into parts_ of the current read position. size_t position_; // The current read position in bytes. - DISALLOW_COPY_AND_ASSIGN(MultipartStream); + RTC_DISALLOW_COPY_AND_ASSIGN(MultipartStream); }; } // namespace rtc diff --git a/webrtc/base/natserver.h b/webrtc/base/natserver.h index e987021773..eb470dc4a9 100644 --- a/webrtc/base/natserver.h +++ b/webrtc/base/natserver.h @@ -116,7 +116,7 @@ class NATServer : public sigslot::has_slots<> { ProxyServer* tcp_proxy_server_; InternalMap* int_map_; ExternalMap* ext_map_; - DISALLOW_COPY_AND_ASSIGN(NATServer); + RTC_DISALLOW_COPY_AND_ASSIGN(NATServer); }; } // namespace rtc diff --git a/webrtc/base/natsocketfactory.h b/webrtc/base/natsocketfactory.h index 3519cf0133..9ca0739440 100644 --- a/webrtc/base/natsocketfactory.h +++ b/webrtc/base/natsocketfactory.h @@ -56,7 +56,7 @@ class NATSocketFactory : public SocketFactory, public NATInternalSocketFactory { SocketFactory* factory_; SocketAddress nat_udp_addr_; SocketAddress nat_tcp_addr_; - DISALLOW_COPY_AND_ASSIGN(NATSocketFactory); + RTC_DISALLOW_COPY_AND_ASSIGN(NATSocketFactory); }; // Creates sockets that will send traffic through a NAT depending on what @@ -153,7 +153,7 @@ class NATSocketServer : public SocketServer, public NATInternalSocketFactory { SocketServer* server_; MessageQueue* msg_queue_; TranslatorMap nats_; - DISALLOW_COPY_AND_ASSIGN(NATSocketServer); + RTC_DISALLOW_COPY_AND_ASSIGN(NATSocketServer); }; // Free-standing NAT helper functions. diff --git a/webrtc/base/nssidentity.h b/webrtc/base/nssidentity.h index 867f594b84..a28ce62ba1 100644 --- a/webrtc/base/nssidentity.h +++ b/webrtc/base/nssidentity.h @@ -60,7 +60,7 @@ class NSSKeyPair { SECKEYPublicKey* pubkey_; SSLKEAType ssl_kea_type_; - DISALLOW_COPY_AND_ASSIGN(NSSKeyPair); + RTC_DISALLOW_COPY_AND_ASSIGN(NSSKeyPair); }; @@ -109,7 +109,7 @@ class NSSCertificate : public SSLCertificate { CERTCertificate* certificate_; scoped_ptr chain_; - DISALLOW_COPY_AND_ASSIGN(NSSCertificate); + RTC_DISALLOW_COPY_AND_ASSIGN(NSSCertificate); }; // Represents a SSL key pair and certificate for NSS. @@ -135,7 +135,7 @@ class NSSIdentity : public SSLIdentity { rtc::scoped_ptr keypair_; rtc::scoped_ptr certificate_; - DISALLOW_COPY_AND_ASSIGN(NSSIdentity); + RTC_DISALLOW_COPY_AND_ASSIGN(NSSIdentity); }; } // namespace rtc diff --git a/webrtc/base/opensslidentity.h b/webrtc/base/opensslidentity.h index 72de6c0e70..d8ba138f62 100644 --- a/webrtc/base/opensslidentity.h +++ b/webrtc/base/opensslidentity.h @@ -45,7 +45,7 @@ class OpenSSLKeyPair { EVP_PKEY* pkey_; - DISALLOW_COPY_AND_ASSIGN(OpenSSLKeyPair); + RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLKeyPair); }; // OpenSSLCertificate encapsulates an OpenSSL X509* certificate object, @@ -92,7 +92,7 @@ class OpenSSLCertificate : public SSLCertificate { X509* x509_; - DISALLOW_COPY_AND_ASSIGN(OpenSSLCertificate); + RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLCertificate); }; // Holds a keypair and certificate together, and a method to generate @@ -120,7 +120,7 @@ class OpenSSLIdentity : public SSLIdentity { scoped_ptr key_pair_; scoped_ptr certificate_; - DISALLOW_COPY_AND_ASSIGN(OpenSSLIdentity); + RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLIdentity); }; diff --git a/webrtc/base/profiler.h b/webrtc/base/profiler.h index 6289035743..68a35b2710 100644 --- a/webrtc/base/profiler.h +++ b/webrtc/base/profiler.h @@ -134,7 +134,7 @@ class Profiler { EventMap events_; mutable SharedExclusiveLock lock_; - DISALLOW_COPY_AND_ASSIGN(Profiler); + RTC_DISALLOW_COPY_AND_ASSIGN(Profiler); }; // Starts an event on construction and stops it on destruction. @@ -151,7 +151,7 @@ class ProfilerScope { private: std::string event_name_; - DISALLOW_COPY_AND_ASSIGN(ProfilerScope); + RTC_DISALLOW_COPY_AND_ASSIGN(ProfilerScope); }; std::ostream& operator<<(std::ostream& stream, diff --git a/webrtc/base/proxyserver.h b/webrtc/base/proxyserver.h index 711ed55bf8..adb26ae9d0 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 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 diff --git a/webrtc/base/referencecountedsingletonfactory.h b/webrtc/base/referencecountedsingletonfactory.h index 7138c8c5e1..f955986827 100644 --- a/webrtc/base/referencecountedsingletonfactory.h +++ b/webrtc/base/referencecountedsingletonfactory.h @@ -77,7 +77,7 @@ class ReferenceCountedSingletonFactory { CriticalSection crit_; int ref_count_; - DISALLOW_COPY_AND_ASSIGN(ReferenceCountedSingletonFactory); + RTC_DISALLOW_COPY_AND_ASSIGN(ReferenceCountedSingletonFactory); }; template @@ -149,7 +149,7 @@ class rcsf_ptr { Interface* instance_; ReferenceCountedSingletonFactory* factory_; - DISALLOW_IMPLICIT_CONSTRUCTORS(rcsf_ptr); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(rcsf_ptr); }; }; // namespace rtc diff --git a/webrtc/base/rollingaccumulator.h b/webrtc/base/rollingaccumulator.h index 25434fb1b9..e105380191 100644 --- a/webrtc/base/rollingaccumulator.h +++ b/webrtc/base/rollingaccumulator.h @@ -165,7 +165,7 @@ class RollingAccumulator { mutable bool min_stale_; std::vector samples_; - DISALLOW_COPY_AND_ASSIGN(RollingAccumulator); + RTC_DISALLOW_COPY_AND_ASSIGN(RollingAccumulator); }; } // namespace rtc diff --git a/webrtc/base/scoped_autorelease_pool.h b/webrtc/base/scoped_autorelease_pool.h index be94acefdd..9aac112793 100644 --- a/webrtc/base/scoped_autorelease_pool.h +++ b/webrtc/base/scoped_autorelease_pool.h @@ -50,7 +50,7 @@ class ScopedAutoreleasePool { NSAutoreleasePool* pool_; - DISALLOW_COPY_AND_ASSIGN(ScopedAutoreleasePool); + RTC_DISALLOW_COPY_AND_ASSIGN(ScopedAutoreleasePool); }; } // namespace rtc diff --git a/webrtc/base/scoped_ptr.h b/webrtc/base/scoped_ptr.h index 676343edc8..203a00138e 100644 --- a/webrtc/base/scoped_ptr.h +++ b/webrtc/base/scoped_ptr.h @@ -298,7 +298,7 @@ class scoped_ptr_impl { Data data_; - DISALLOW_COPY_AND_ASSIGN(scoped_ptr_impl); + RTC_DISALLOW_COPY_AND_ASSIGN(scoped_ptr_impl); }; } // namespace internal diff --git a/webrtc/base/scopedptrcollection.h b/webrtc/base/scopedptrcollection.h index 47dff6503b..cfdb6f9673 100644 --- a/webrtc/base/scopedptrcollection.h +++ b/webrtc/base/scopedptrcollection.h @@ -52,7 +52,7 @@ class ScopedPtrCollection { private: VectorT collection_; - DISALLOW_COPY_AND_ASSIGN(ScopedPtrCollection); + RTC_DISALLOW_COPY_AND_ASSIGN(ScopedPtrCollection); }; } // namespace rtc diff --git a/webrtc/base/scopedptrcollection_unittest.cc b/webrtc/base/scopedptrcollection_unittest.cc index 30b8ed9ed0..933173e3fa 100644 --- a/webrtc/base/scopedptrcollection_unittest.cc +++ b/webrtc/base/scopedptrcollection_unittest.cc @@ -28,7 +28,7 @@ class InstanceCounter { private: int* num_instances_; - DISALLOW_COPY_AND_ASSIGN(InstanceCounter); + RTC_DISALLOW_COPY_AND_ASSIGN(InstanceCounter); }; } // namespace diff --git a/webrtc/base/sharedexclusivelock.h b/webrtc/base/sharedexclusivelock.h index aaaba3b83c..a6ca5735a2 100644 --- a/webrtc/base/sharedexclusivelock.h +++ b/webrtc/base/sharedexclusivelock.h @@ -36,7 +36,7 @@ class LOCKABLE SharedExclusiveLock { rtc::Event shared_count_is_zero_; int shared_count_; - DISALLOW_COPY_AND_ASSIGN(SharedExclusiveLock); + RTC_DISALLOW_COPY_AND_ASSIGN(SharedExclusiveLock); }; class SCOPED_LOCKABLE SharedScope { @@ -51,7 +51,7 @@ class SCOPED_LOCKABLE SharedScope { private: SharedExclusiveLock* lock_; - DISALLOW_COPY_AND_ASSIGN(SharedScope); + RTC_DISALLOW_COPY_AND_ASSIGN(SharedScope); }; class SCOPED_LOCKABLE ExclusiveScope { @@ -67,7 +67,7 @@ class SCOPED_LOCKABLE ExclusiveScope { private: SharedExclusiveLock* lock_; - DISALLOW_COPY_AND_ASSIGN(ExclusiveScope); + RTC_DISALLOW_COPY_AND_ASSIGN(ExclusiveScope); }; } // namespace rtc diff --git a/webrtc/base/signalthread.h b/webrtc/base/signalthread.h index 3a9205c4ca..4dda88966c 100644 --- a/webrtc/base/signalthread.h +++ b/webrtc/base/signalthread.h @@ -112,7 +112,7 @@ class SignalThread private: SignalThread* parent_; - DISALLOW_IMPLICIT_CONSTRUCTORS(Worker); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Worker); }; class SCOPED_LOCKABLE EnterExit { @@ -135,7 +135,7 @@ class SignalThread private: SignalThread* t_; - DISALLOW_IMPLICIT_CONSTRUCTORS(EnterExit); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EnterExit); }; void Run(); @@ -147,7 +147,7 @@ class SignalThread State state_; int refcount_; - DISALLOW_COPY_AND_ASSIGN(SignalThread); + RTC_DISALLOW_COPY_AND_ASSIGN(SignalThread); }; /////////////////////////////////////////////////////////////////////////////// diff --git a/webrtc/base/signalthread_unittest.cc b/webrtc/base/signalthread_unittest.cc index 1750101fb8..fe6c6023a6 100644 --- a/webrtc/base/signalthread_unittest.cc +++ b/webrtc/base/signalthread_unittest.cc @@ -57,7 +57,7 @@ class SignalThreadTest : public testing::Test, public sigslot::has_slots<> { private: SignalThreadTest* harness_; - DISALLOW_COPY_AND_ASSIGN(SlowSignalThread); + RTC_DISALLOW_COPY_AND_ASSIGN(SlowSignalThread); }; void OnWorkComplete(rtc::SignalThread* thread) { @@ -128,7 +128,7 @@ class OwnerThread : public Thread, public sigslot::has_slots<> { private: SignalThreadTest* harness_; bool has_run_; - DISALLOW_COPY_AND_ASSIGN(OwnerThread); + RTC_DISALLOW_COPY_AND_ASSIGN(OwnerThread); }; // Test for when the main thread goes away while the diff --git a/webrtc/base/sigslottester.h b/webrtc/base/sigslottester.h index ae781a97e3..cdbd44aa90 100755 --- a/webrtc/base/sigslottester.h +++ b/webrtc/base/sigslottester.h @@ -71,7 +71,7 @@ class SigslotTester1 : public sigslot::has_slots<> { int callback_count_; C1* capture1_; - DISALLOW_COPY_AND_ASSIGN(SigslotTester1); + RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester1); }; template @@ -97,7 +97,7 @@ class SigslotTester2 : public sigslot::has_slots<> { C1* capture1_; C2* capture2_; - DISALLOW_COPY_AND_ASSIGN(SigslotTester2); + RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester2); }; template @@ -125,7 +125,7 @@ class SigslotTester3 : public sigslot::has_slots<> { C2* capture2_; C3* capture3_; - DISALLOW_COPY_AND_ASSIGN(SigslotTester3); + RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester3); }; template { C3* capture3_; C4* capture4_; - DISALLOW_COPY_AND_ASSIGN(SigslotTester4); + RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester4); }; template { C4* capture4_; C5* capture5_; - DISALLOW_COPY_AND_ASSIGN(SigslotTester5); + RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester5); }; } // namespace rtc diff --git a/webrtc/base/sigslottester.h.pump b/webrtc/base/sigslottester.h.pump index 2fd9386a16..4410991d9e 100755 --- a/webrtc/base/sigslottester.h.pump +++ b/webrtc/base/sigslottester.h.pump @@ -76,7 +76,7 @@ class SigslotTester$i : public sigslot::has_slots<> { C$j* capture$j[[]]_;]] - DISALLOW_COPY_AND_ASSIGN(SigslotTester$i); + RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester$i); }; ]] diff --git a/webrtc/base/socket.h b/webrtc/base/socket.h index 08ab5eb793..d2eb8c144d 100644 --- a/webrtc/base/socket.h +++ b/webrtc/base/socket.h @@ -109,7 +109,7 @@ #define EREMOTE WSAEREMOTE #undef EACCES #define SOCKET_EACCES WSAEACCES -#endif // WEBRTC_WIN +#endif // WEBRTC_WIN #if defined(WEBRTC_POSIX) #define INVALID_SOCKET (-1) @@ -180,7 +180,7 @@ class Socket { Socket() {} private: - DISALLOW_COPY_AND_ASSIGN(Socket); + RTC_DISALLOW_COPY_AND_ASSIGN(Socket); }; } // namespace rtc diff --git a/webrtc/base/socketadapters.h b/webrtc/base/socketadapters.h index fe6e7b061f..b7d3d4b4fc 100644 --- a/webrtc/base/socketadapters.h +++ b/webrtc/base/socketadapters.h @@ -50,7 +50,7 @@ class BufferedReadAdapter : public AsyncSocketAdapter { char * buffer_; size_t buffer_size_, data_len_; bool buffering_; - DISALLOW_COPY_AND_ASSIGN(BufferedReadAdapter); + RTC_DISALLOW_COPY_AND_ASSIGN(BufferedReadAdapter); }; /////////////////////////////////////////////////////////////////////////////// @@ -78,7 +78,7 @@ class AsyncSSLSocket : public BufferedReadAdapter { protected: void OnConnectEvent(AsyncSocket* socket) override; void ProcessInput(char* data, size_t* len) override; - DISALLOW_COPY_AND_ASSIGN(AsyncSSLSocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncSSLSocket); }; // Implements a socket adapter that performs the server side of a @@ -89,7 +89,7 @@ class AsyncSSLServerSocket : public BufferedReadAdapter { protected: void ProcessInput(char* data, size_t* len) override; - DISALLOW_COPY_AND_ASSIGN(AsyncSSLServerSocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncSSLServerSocket); }; /////////////////////////////////////////////////////////////////////////////// @@ -137,7 +137,7 @@ class AsyncHttpsProxySocket : public BufferedReadAdapter { } state_; HttpAuthContext * context_; std::string unknown_mechanisms_; - DISALLOW_COPY_AND_ASSIGN(AsyncHttpsProxySocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncHttpsProxySocket); }; /* TODO: Implement this. @@ -148,7 +148,7 @@ class AsyncHttpsProxyServerSocket : public AsyncProxyServerSocket { private: virtual void ProcessInput(char * data, size_t& len); void Error(int error); - DISALLOW_COPY_AND_ASSIGN(AsyncHttpsProxyServerSocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncHttpsProxyServerSocket); }; */ @@ -183,7 +183,7 @@ class AsyncSocksProxySocket : public BufferedReadAdapter { SocketAddress proxy_, dest_; std::string user_; CryptString pass_; - DISALLOW_COPY_AND_ASSIGN(AsyncSocksProxySocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncSocksProxySocket); }; // Implements a proxy server socket for the SOCKS protocol. @@ -209,7 +209,7 @@ class AsyncSocksProxyServerSocket : public AsyncProxyServerSocket { SS_HELLO, SS_AUTH, SS_CONNECT, SS_CONNECT_PENDING, SS_TUNNEL, SS_ERROR }; State state_; - DISALLOW_COPY_AND_ASSIGN(AsyncSocksProxyServerSocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncSocksProxyServerSocket); }; /////////////////////////////////////////////////////////////////////////////// @@ -235,7 +235,7 @@ class LoggingSocketAdapter : public AsyncSocketAdapter { std::string label_; bool hex_mode_; LogMultilineState lms_; - DISALLOW_COPY_AND_ASSIGN(LoggingSocketAdapter); + RTC_DISALLOW_COPY_AND_ASSIGN(LoggingSocketAdapter); }; /////////////////////////////////////////////////////////////////////////////// diff --git a/webrtc/base/socketstream.h b/webrtc/base/socketstream.h index 876115686c..fd8b559007 100644 --- a/webrtc/base/socketstream.h +++ b/webrtc/base/socketstream.h @@ -51,7 +51,7 @@ class SocketStream : public StreamInterface, public sigslot::has_slots<> { AsyncSocket* socket_; - DISALLOW_COPY_AND_ASSIGN(SocketStream); + RTC_DISALLOW_COPY_AND_ASSIGN(SocketStream); }; /////////////////////////////////////////////////////////////////////////////// diff --git a/webrtc/base/sslidentity.h b/webrtc/base/sslidentity.h index 47694bb629..acbd94ef7d 100644 --- a/webrtc/base/sslidentity.h +++ b/webrtc/base/sslidentity.h @@ -104,7 +104,7 @@ class SSLCertChain { std::vector certs_; - DISALLOW_COPY_AND_ASSIGN(SSLCertChain); + RTC_DISALLOW_COPY_AND_ASSIGN(SSLCertChain); }; // TODO(hbos, torbjorng): Don't change KT_DEFAULT without first diff --git a/webrtc/base/stream.h b/webrtc/base/stream.h index b3317663b5..c57daae76c 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 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); }; /////////////////////////////////////////////////////////////////////////////// diff --git a/webrtc/base/task_unittest.cc b/webrtc/base/task_unittest.cc index a9cb7046e1..1135a73a0f 100644 --- a/webrtc/base/task_unittest.cc +++ b/webrtc/base/task_unittest.cc @@ -18,7 +18,7 @@ #if defined(WEBRTC_WIN) #include "webrtc/base/win32.h" -#endif // WEBRTC_WIN +#endif // WEBRTC_WIN #include "webrtc/base/common.h" #include "webrtc/base/gunit.h" @@ -270,7 +270,7 @@ class TaskTest : public sigslot::has_slots<> { EXPECT_TRUE(stuck_[i].timed_out_); if (!stuck_[i].timed_out_) { std::cout << "Stuck task #" << i << " timeout is at " - << stuck_[i].task_->timeout_time() << std::endl; + << stuck_[i].task_->timeout_time() << std::endl; } } @@ -308,7 +308,7 @@ class AbortTask : public Task { return STATE_NEXT; } private: - DISALLOW_COPY_AND_ASSIGN(AbortTask); + RTC_DISALLOW_COPY_AND_ASSIGN(AbortTask); }; class TaskAbortTest : public sigslot::has_slots<> { @@ -333,7 +333,7 @@ class TaskAbortTest : public sigslot::has_slots<> { } MyTaskRunner task_runner_; - DISALLOW_COPY_AND_ASSIGN(TaskAbortTest); + RTC_DISALLOW_COPY_AND_ASSIGN(TaskAbortTest); }; TEST(start_task_test, Abort) { @@ -363,7 +363,7 @@ class SetBoolOnDeleteTask : public Task { private: bool* set_when_deleted_; - DISALLOW_COPY_AND_ASSIGN(SetBoolOnDeleteTask); + RTC_DISALLOW_COPY_AND_ASSIGN(SetBoolOnDeleteTask); }; class AbortShouldWakeTest : public sigslot::has_slots<> { @@ -396,7 +396,7 @@ class AbortShouldWakeTest : public sigslot::has_slots<> { } MyTaskRunner task_runner_; - DISALLOW_COPY_AND_ASSIGN(AbortShouldWakeTest); + RTC_DISALLOW_COPY_AND_ASSIGN(AbortShouldWakeTest); }; TEST(start_task_test, AbortShouldWake) { @@ -477,7 +477,7 @@ class TimeoutChangeTest : public sigslot::has_slots<> { MyTaskRunner task_runner_; StuckTask* (stuck_tasks_[3]); int task_count_; - DISALLOW_COPY_AND_ASSIGN(TimeoutChangeTest); + RTC_DISALLOW_COPY_AND_ASSIGN(TimeoutChangeTest); }; TEST(start_task_test, TimeoutChange) { @@ -494,7 +494,7 @@ class DeleteTestTaskRunner : public TaskRunner { return GetCurrentTime(); } private: - DISALLOW_COPY_AND_ASSIGN(DeleteTestTaskRunner); + RTC_DISALLOW_COPY_AND_ASSIGN(DeleteTestTaskRunner); }; TEST(unstarted_task_test, DeleteTask) { diff --git a/webrtc/base/taskparent.h b/webrtc/base/taskparent.h index 482b2a674f..e9342c1c52 100644 --- a/webrtc/base/taskparent.h +++ b/webrtc/base/taskparent.h @@ -53,7 +53,7 @@ class TaskParent { bool child_error_; typedef std::set ChildSet; scoped_ptr children_; - DISALLOW_COPY_AND_ASSIGN(TaskParent); + RTC_DISALLOW_COPY_AND_ASSIGN(TaskParent); }; diff --git a/webrtc/base/testclient.h b/webrtc/base/testclient.h index cd2ba360ad..5d8ee98a6f 100644 --- a/webrtc/base/testclient.h +++ b/webrtc/base/testclient.h @@ -89,7 +89,7 @@ class TestClient : public sigslot::has_slots<> { AsyncPacketSocket* socket_; std::vector* packets_; bool ready_to_send_; - DISALLOW_COPY_AND_ASSIGN(TestClient); + RTC_DISALLOW_COPY_AND_ASSIGN(TestClient); }; } // namespace rtc diff --git a/webrtc/base/testechoserver.h b/webrtc/base/testechoserver.h index b3de441f4e..51d7d539e4 100644 --- a/webrtc/base/testechoserver.h +++ b/webrtc/base/testechoserver.h @@ -65,7 +65,7 @@ class TestEchoServer : public sigslot::has_slots<> { typedef std::list ClientList; scoped_ptr server_socket_; ClientList client_sockets_; - DISALLOW_COPY_AND_ASSIGN(TestEchoServer); + RTC_DISALLOW_COPY_AND_ASSIGN(TestEchoServer); }; } // namespace rtc diff --git a/webrtc/base/thread.h b/webrtc/base/thread.h index 3a9efb0c99..1a04de56c4 100644 --- a/webrtc/base/thread.h +++ b/webrtc/base/thread.h @@ -68,7 +68,7 @@ class ThreadManager { DWORD key_; #endif - DISALLOW_COPY_AND_ASSIGN(ThreadManager); + RTC_DISALLOW_COPY_AND_ASSIGN(ThreadManager); }; struct _SendMessage { @@ -94,7 +94,7 @@ class Runnable { Runnable() {} private: - DISALLOW_COPY_AND_ASSIGN(Runnable); + RTC_DISALLOW_COPY_AND_ASSIGN(Runnable); }; // WARNING! SUBCLASSES MUST CALL Stop() IN THEIR DESTRUCTORS! See ~Thread(). @@ -287,7 +287,7 @@ class Thread : public MessageQueue { friend class ThreadManager; - DISALLOW_COPY_AND_ASSIGN(Thread); + RTC_DISALLOW_COPY_AND_ASSIGN(Thread); }; // AutoThread automatically installs itself at construction @@ -300,7 +300,7 @@ class AutoThread : public Thread { ~AutoThread() override; private: - DISALLOW_COPY_AND_ASSIGN(AutoThread); + RTC_DISALLOW_COPY_AND_ASSIGN(AutoThread); }; // Win32 extension for threads that need to use COM @@ -314,7 +314,7 @@ class ComThread : public Thread { virtual void Run(); private: - DISALLOW_COPY_AND_ASSIGN(ComThread); + RTC_DISALLOW_COPY_AND_ASSIGN(ComThread); }; #endif @@ -332,7 +332,7 @@ class SocketServerScope { private: SocketServer* old_ss_; - DISALLOW_IMPLICIT_CONSTRUCTORS(SocketServerScope); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SocketServerScope); }; } // namespace rtc diff --git a/webrtc/base/thread_checker_unittest.cc b/webrtc/base/thread_checker_unittest.cc index 3c496314fa..a193248eb7 100644 --- a/webrtc/base/thread_checker_unittest.cc +++ b/webrtc/base/thread_checker_unittest.cc @@ -49,7 +49,7 @@ class ThreadCheckerClass : public ThreadChecker { static void DetachThenCallFromDifferentThreadImpl(); private: - DISALLOW_COPY_AND_ASSIGN(ThreadCheckerClass); + RTC_DISALLOW_COPY_AND_ASSIGN(ThreadCheckerClass); }; // Calls ThreadCheckerClass::DoStuff on another thread. @@ -72,7 +72,7 @@ class CallDoStuffOnThread : public Thread { private: ThreadCheckerClass* thread_checker_class_; - DISALLOW_COPY_AND_ASSIGN(CallDoStuffOnThread); + RTC_DISALLOW_COPY_AND_ASSIGN(CallDoStuffOnThread); }; // Deletes ThreadCheckerClass on a different thread. @@ -96,7 +96,7 @@ class DeleteThreadCheckerClassOnThread : public Thread { private: scoped_ptr thread_checker_class_; - DISALLOW_COPY_AND_ASSIGN(DeleteThreadCheckerClassOnThread); + RTC_DISALLOW_COPY_AND_ASSIGN(DeleteThreadCheckerClassOnThread); }; } // namespace diff --git a/webrtc/base/virtualsocketserver.h b/webrtc/base/virtualsocketserver.h index c708bb4a89..f2938ff616 100644 --- a/webrtc/base/virtualsocketserver.h +++ b/webrtc/base/virtualsocketserver.h @@ -243,7 +243,7 @@ class VirtualSocketServer : public SocketServer, public sigslot::has_slots<> { CriticalSection delay_crit_; double drop_prob_; - DISALLOW_COPY_AND_ASSIGN(VirtualSocketServer); + RTC_DISALLOW_COPY_AND_ASSIGN(VirtualSocketServer); }; // Implements the socket interface using the virtual network. Packets are diff --git a/webrtc/base/win32regkey.h b/webrtc/base/win32regkey.h index 8bd80602e8..8e637807e6 100644 --- a/webrtc/base/win32regkey.h +++ b/webrtc/base/win32regkey.h @@ -329,7 +329,7 @@ class RegKey { // for unittest friend void RegKeyHelperFunctionsTest(); - DISALLOW_COPY_AND_ASSIGN(RegKey); + RTC_DISALLOW_COPY_AND_ASSIGN(RegKey); }; } // namespace rtc diff --git a/webrtc/base/worker.h b/webrtc/base/worker.h index d5594e3b87..17ae8cf67b 100644 --- a/webrtc/base/worker.h +++ b/webrtc/base/worker.h @@ -64,7 +64,7 @@ class Worker : private MessageHandler { // The thread that is currently doing the work. Thread *worker_thread_; - DISALLOW_COPY_AND_ASSIGN(Worker); + RTC_DISALLOW_COPY_AND_ASSIGN(Worker); }; } // namespace rtc diff --git a/webrtc/base/x11windowpicker.cc b/webrtc/base/x11windowpicker.cc index 918913a92b..f7c79111e3 100644 --- a/webrtc/base/x11windowpicker.cc +++ b/webrtc/base/x11windowpicker.cc @@ -73,7 +73,7 @@ class XWindowProperty { unsigned long size_; // NOLINT: type required by XGetWindowProperty unsigned char* data_; - DISALLOW_COPY_AND_ASSIGN(XWindowProperty); + RTC_DISALLOW_COPY_AND_ASSIGN(XWindowProperty); }; // Stupid X11. It seems none of the synchronous returns codes from X11 calls @@ -118,7 +118,7 @@ class XErrorSuppressor { Display* display_; XErrorHandler original_error_handler_; - DISALLOW_COPY_AND_ASSIGN(XErrorSuppressor); + RTC_DISALLOW_COPY_AND_ASSIGN(XErrorSuppressor); }; // Hiding all X11 specifics inside its own class. This to avoid diff --git a/webrtc/common.h b/webrtc/common.h index d0d7eb192c..dda045ee6c 100644 --- a/webrtc/common.h +++ b/webrtc/common.h @@ -95,7 +95,7 @@ class Config { typedef std::map OptionMap; OptionMap options_; - // DISALLOW_COPY_AND_ASSIGN + // RTC_DISALLOW_COPY_AND_ASSIGN Config(const Config&); void operator=(const Config&); }; diff --git a/webrtc/common_audio/audio_converter.h b/webrtc/common_audio/audio_converter.h index 407b5ff9e7..c6fe08e2d0 100644 --- a/webrtc/common_audio/audio_converter.h +++ b/webrtc/common_audio/audio_converter.h @@ -58,7 +58,7 @@ class AudioConverter { const int dst_channels_; const size_t dst_frames_; - DISALLOW_COPY_AND_ASSIGN(AudioConverter); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioConverter); }; } // namespace webrtc diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.h b/webrtc/common_audio/resampler/push_sinc_resampler.h index 4307451113..cefc62aa2a 100644 --- a/webrtc/common_audio/resampler/push_sinc_resampler.h +++ b/webrtc/common_audio/resampler/push_sinc_resampler.h @@ -68,7 +68,7 @@ class PushSincResampler : public SincResamplerCallback { // Used to assert we are only requested for as much data as is available. size_t source_available_; - DISALLOW_COPY_AND_ASSIGN(PushSincResampler); + RTC_DISALLOW_COPY_AND_ASSIGN(PushSincResampler); }; } // namespace webrtc diff --git a/webrtc/common_audio/resampler/sinc_resampler.h b/webrtc/common_audio/resampler/sinc_resampler.h index 3f2ec33272..189112bf54 100644 --- a/webrtc/common_audio/resampler/sinc_resampler.h +++ b/webrtc/common_audio/resampler/sinc_resampler.h @@ -162,7 +162,7 @@ class SincResampler { float* r3_; float* r4_; - DISALLOW_COPY_AND_ASSIGN(SincResampler); + RTC_DISALLOW_COPY_AND_ASSIGN(SincResampler); }; } // namespace webrtc diff --git a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h index f1281806df..1807f86a19 100644 --- a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h +++ b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h @@ -47,7 +47,7 @@ class SinusoidalLinearChirpSource : public SincResamplerCallback { size_t current_index_; double delay_samples_; - DISALLOW_COPY_AND_ASSIGN(SinusoidalLinearChirpSource); + RTC_DISALLOW_COPY_AND_ASSIGN(SinusoidalLinearChirpSource); }; } // namespace webrtc diff --git a/webrtc/common_audio/sparse_fir_filter.h b/webrtc/common_audio/sparse_fir_filter.h index 9322afcdcc..2ba5cf4600 100644 --- a/webrtc/common_audio/sparse_fir_filter.h +++ b/webrtc/common_audio/sparse_fir_filter.h @@ -44,7 +44,7 @@ class SparseFIRFilter final { const std::vector nonzero_coeffs_; std::vector state_; - DISALLOW_COPY_AND_ASSIGN(SparseFIRFilter); + RTC_DISALLOW_COPY_AND_ASSIGN(SparseFIRFilter); }; } // namespace webrtc diff --git a/webrtc/common_audio/wav_file.h b/webrtc/common_audio/wav_file.h index 2f2e793a1e..14a8a0e2df 100644 --- a/webrtc/common_audio/wav_file.h +++ b/webrtc/common_audio/wav_file.h @@ -58,7 +58,7 @@ class WavWriter final : public WavFile { uint32_t num_samples_; // Total number of samples written to file. FILE* file_handle_; // Output file, owned by this class - DISALLOW_COPY_AND_ASSIGN(WavWriter); + RTC_DISALLOW_COPY_AND_ASSIGN(WavWriter); }; // Follows the conventions of WavWriter. @@ -87,7 +87,7 @@ class WavReader final : public WavFile { uint32_t num_samples_remaining_; FILE* file_handle_; // Input file, owned by this class. - DISALLOW_COPY_AND_ASSIGN(WavReader); + RTC_DISALLOW_COPY_AND_ASSIGN(WavReader); }; } // namespace webrtc diff --git a/webrtc/common_audio/window_generator.h b/webrtc/common_audio/window_generator.h index f28542c8f9..25dd233b44 100644 --- a/webrtc/common_audio/window_generator.h +++ b/webrtc/common_audio/window_generator.h @@ -24,7 +24,7 @@ class WindowGenerator { static void KaiserBesselDerived(float alpha, size_t length, float* window); private: - DISALLOW_IMPLICIT_CONSTRUCTORS(WindowGenerator); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WindowGenerator); }; } // namespace webrtc diff --git a/webrtc/libjingle/xmpp/pubsubstateclient.h b/webrtc/libjingle/xmpp/pubsubstateclient.h index 0c53842a04..ffb794af4c 100644 --- a/webrtc/libjingle/xmpp/pubsubstateclient.h +++ b/webrtc/libjingle/xmpp/pubsubstateclient.h @@ -263,7 +263,7 @@ class PubSubStateClient : public sigslot::has_slots<> { // itemid => StateItemInfo std::map info_by_itemid_; - DISALLOW_COPY_AND_ASSIGN(PubSubStateClient); + RTC_DISALLOW_COPY_AND_ASSIGN(PubSubStateClient); }; } // namespace buzz diff --git a/webrtc/libjingle/xmpp/xmpptask.h b/webrtc/libjingle/xmpp/xmpptask.h index 2e10d63e15..5b97e89c97 100644 --- a/webrtc/libjingle/xmpp/xmpptask.h +++ b/webrtc/libjingle/xmpp/xmpptask.h @@ -67,7 +67,7 @@ class XmppClientInterface { virtual void RemoveXmppTask(XmppTask* task) = 0; sigslot::signal0<> SignalDisconnected; - DISALLOW_COPY_AND_ASSIGN(XmppClientInterface); + RTC_DISALLOW_COPY_AND_ASSIGN(XmppClientInterface); }; // XmppTaskParentInterface is the interface require for any parent of @@ -86,7 +86,7 @@ class XmppTaskParentInterface : public rtc::Task { virtual XmppClientInterface* GetClient() = 0; - DISALLOW_COPY_AND_ASSIGN(XmppTaskParentInterface); + RTC_DISALLOW_COPY_AND_ASSIGN(XmppTaskParentInterface); }; class XmppTaskBase : public XmppTaskParentInterface { @@ -104,7 +104,7 @@ class XmppTaskBase : public XmppTaskParentInterface { protected: XmppTaskParentInterface* parent_; - DISALLOW_COPY_AND_ASSIGN(XmppTaskBase); + RTC_DISALLOW_COPY_AND_ASSIGN(XmppTaskBase); }; class XmppTask : public XmppTaskBase, diff --git a/webrtc/modules/audio_coding/codecs/audio_decoder.h b/webrtc/modules/audio_coding/codecs/audio_decoder.h index 5e9e33d47b..556268c3f2 100644 --- a/webrtc/modules/audio_coding/codecs/audio_decoder.h +++ b/webrtc/modules/audio_coding/codecs/audio_decoder.h @@ -115,7 +115,7 @@ class AudioDecoder { SpeechType* speech_type); private: - DISALLOW_COPY_AND_ASSIGN(AudioDecoder); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoder); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h index 686b45a742..50d369ba35 100644 --- a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h +++ b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h @@ -91,7 +91,7 @@ class AudioEncoderIsacT final : public AudioEncoder { // Timestamp of the previously encoded packet. uint32_t last_encoded_timestamp_; - DISALLOW_COPY_AND_ASSIGN(AudioEncoderIsacT); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderIsacT); }; template @@ -122,7 +122,7 @@ class AudioDecoderIsacT final : public AudioDecoder { LockedIsacBandwidthInfo* bwinfo_; int decoder_sample_rate_hz_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h b/webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h index 9fa77b0992..4dd515714d 100644 --- a/webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h +++ b/webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h @@ -43,7 +43,7 @@ class AudioDecoderOpus : public AudioDecoder { private: OpusDecInst* dec_state_; const size_t channels_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receive_test.h b/webrtc/modules/audio_coding/main/acm2/acm_receive_test.h index a1e01423bc..80e9fbede6 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receive_test.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_receive_test.h @@ -56,7 +56,7 @@ class AcmReceiveTest { const int output_freq_hz_; NumOutputChannels expected_output_channels_; - DISALLOW_COPY_AND_ASSIGN(AcmReceiveTest); + RTC_DISALLOW_COPY_AND_ASSIGN(AcmReceiveTest); }; } // namespace test diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h b/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h index 8e80ca79b5..6c1209739d 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h @@ -64,7 +64,7 @@ class AcmReceiveTestOldApi { int output_freq_hz_; NumOutputChannels exptected_output_channels_; - DISALLOW_COPY_AND_ASSIGN(AcmReceiveTestOldApi); + RTC_DISALLOW_COPY_AND_ASSIGN(AcmReceiveTestOldApi); }; // This test toggles the output frequency every |toggle_period_ms|. The test diff --git a/webrtc/modules/audio_coding/main/acm2/acm_send_test.h b/webrtc/modules/audio_coding/main/acm2/acm_send_test.h index 09fe9e6655..b0d26ba63b 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_send_test.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_send_test.h @@ -74,7 +74,7 @@ class AcmSendTest : public AudioPacketizationCallback, public PacketSource { uint16_t sequence_number_; std::vector last_payload_vec_; - DISALLOW_COPY_AND_ASSIGN(AcmSendTest); + RTC_DISALLOW_COPY_AND_ASSIGN(AcmSendTest); }; } // namespace test diff --git a/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h b/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h index 523498bc3e..7d17cb117d 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h @@ -83,7 +83,7 @@ class AcmSendTestOldApi : public AudioPacketizationCallback, std::vector last_payload_vec_; bool data_to_send_; - DISALLOW_COPY_AND_ASSIGN(AcmSendTestOldApi); + RTC_DISALLOW_COPY_AND_ASSIGN(AcmSendTestOldApi); }; } // namespace test diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.h b/webrtc/modules/audio_coding/main/acm2/codec_manager.h index 3372b7f27b..2337521edf 100644 --- a/webrtc/modules/audio_coding/main/acm2/codec_manager.h +++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.h @@ -82,7 +82,7 @@ class CodecManager final { CodecOwner codec_owner_; bool encoder_is_opus_; - DISALLOW_COPY_AND_ASSIGN(CodecManager); + RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager); }; } // namespace acm2 diff --git a/webrtc/modules/audio_coding/main/acm2/codec_owner.h b/webrtc/modules/audio_coding/main/acm2/codec_owner.h index cb533b676b..ae7e4520b3 100644 --- a/webrtc/modules/audio_coding/main/acm2/codec_owner.h +++ b/webrtc/modules/audio_coding/main/acm2/codec_owner.h @@ -70,7 +70,7 @@ class CodecOwner { rtc::scoped_ptr cng_encoder_; rtc::scoped_ptr red_encoder_; - DISALLOW_COPY_AND_ASSIGN(CodecOwner); + RTC_DISALLOW_COPY_AND_ASSIGN(CodecOwner); }; } // namespace acm2 diff --git a/webrtc/modules/audio_coding/neteq/accelerate.h b/webrtc/modules/audio_coding/neteq/accelerate.h index 1238b774df..f66bc8ed34 100644 --- a/webrtc/modules/audio_coding/neteq/accelerate.h +++ b/webrtc/modules/audio_coding/neteq/accelerate.h @@ -65,7 +65,7 @@ class Accelerate : public TimeStretch { AudioMultiVector* output) const override; private: - DISALLOW_COPY_AND_ASSIGN(Accelerate); + RTC_DISALLOW_COPY_AND_ASSIGN(Accelerate); }; struct AccelerateFactory { diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h index 6be344b084..345f4d5385 100644 --- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h @@ -46,7 +46,7 @@ class AudioDecoderPcmU : public AudioDecoder { SpeechType* speech_type) override; private: - DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU); }; class AudioDecoderPcmA : public AudioDecoder { @@ -64,7 +64,7 @@ class AudioDecoderPcmA : public AudioDecoder { SpeechType* speech_type) override; private: - DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA); }; class AudioDecoderPcmUMultiCh : public AudioDecoderPcmU { @@ -77,7 +77,7 @@ class AudioDecoderPcmUMultiCh : public AudioDecoderPcmU { private: const size_t channels_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh); }; class AudioDecoderPcmAMultiCh : public AudioDecoderPcmA { @@ -90,7 +90,7 @@ class AudioDecoderPcmAMultiCh : public AudioDecoderPcmA { private: const size_t channels_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh); }; #ifdef WEBRTC_CODEC_PCM16 @@ -111,7 +111,7 @@ class AudioDecoderPcm16B : public AudioDecoder { SpeechType* speech_type) override; private: - DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16B); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16B); }; // This class handles all four types (i.e., sample rates) of PCM16B codecs. @@ -124,7 +124,7 @@ class AudioDecoderPcm16BMultiCh : public AudioDecoderPcm16B { private: const size_t channels_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16BMultiCh); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16BMultiCh); }; #endif @@ -147,7 +147,7 @@ class AudioDecoderIlbc : public AudioDecoder { private: IlbcDecoderInstance* dec_state_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderIlbc); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderIlbc); }; #endif @@ -170,7 +170,7 @@ class AudioDecoderG722 : public AudioDecoder { private: G722DecInst* dec_state_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722); }; class AudioDecoderG722Stereo : public AudioDecoder { @@ -199,7 +199,7 @@ class AudioDecoderG722Stereo : public AudioDecoder { G722DecInst* dec_state_left_; G722DecInst* dec_state_right_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo); }; #endif @@ -232,7 +232,7 @@ class AudioDecoderCng : public AudioDecoder { private: CNG_dec_inst* dec_state_; - DISALLOW_COPY_AND_ASSIGN(AudioDecoderCng); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderCng); }; enum NetEqDecoder { diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector.h b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h index 0aae9e3351..1c28648816 100644 --- a/webrtc/modules/audio_coding/neteq/audio_multi_vector.h +++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h @@ -132,7 +132,7 @@ class AudioMultiVector { size_t num_channels_; private: - DISALLOW_COPY_AND_ASSIGN(AudioMultiVector); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioMultiVector); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/audio_vector.h b/webrtc/modules/audio_coding/neteq/audio_vector.h index b44fbff74a..e046e38277 100644 --- a/webrtc/modules/audio_coding/neteq/audio_vector.h +++ b/webrtc/modules/audio_coding/neteq/audio_vector.h @@ -105,7 +105,7 @@ class AudioVector { // Note that this index may point outside of array_. size_t capacity_; // Allocated number of samples in the array. - DISALLOW_COPY_AND_ASSIGN(AudioVector); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioVector); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/background_noise.h b/webrtc/modules/audio_coding/neteq/background_noise.h index 9ad12b76c0..2c67f21c3a 100644 --- a/webrtc/modules/audio_coding/neteq/background_noise.h +++ b/webrtc/modules/audio_coding/neteq/background_noise.h @@ -130,7 +130,7 @@ class BackgroundNoise { bool initialized_; NetEq::BackgroundNoiseMode mode_; - DISALLOW_COPY_AND_ASSIGN(BackgroundNoise); + RTC_DISALLOW_COPY_AND_ASSIGN(BackgroundNoise); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h index add3cc4ffc..030870653c 100644 --- a/webrtc/modules/audio_coding/neteq/buffer_level_filter.h +++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h @@ -42,7 +42,7 @@ class BufferLevelFilter { int level_factor_; // Filter factor for the buffer level filter in Q8. int filtered_current_level_; // Filtered current buffer level in Q8. - DISALLOW_COPY_AND_ASSIGN(BufferLevelFilter); + RTC_DISALLOW_COPY_AND_ASSIGN(BufferLevelFilter); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise.h b/webrtc/modules/audio_coding/neteq/comfort_noise.h index d465596245..1fc2258663 100644 --- a/webrtc/modules/audio_coding/neteq/comfort_noise.h +++ b/webrtc/modules/audio_coding/neteq/comfort_noise.h @@ -66,7 +66,7 @@ class ComfortNoise { DecoderDatabase* decoder_database_; SyncBuffer* sync_buffer_; int internal_error_code_; - DISALLOW_COPY_AND_ASSIGN(ComfortNoise); + RTC_DISALLOW_COPY_AND_ASSIGN(ComfortNoise); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/decision_logic.h b/webrtc/modules/audio_coding/neteq/decision_logic.h index cb3dba0edc..30f7ddd3c7 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic.h @@ -161,7 +161,7 @@ class DecisionLogic { const NetEqPlayoutMode playout_mode_; private: - DISALLOW_COPY_AND_ASSIGN(DecisionLogic); + RTC_DISALLOW_COPY_AND_ASSIGN(DecisionLogic); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_fax.h b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h index 861e2fa87d..204dcc168a 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic_fax.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h @@ -53,7 +53,7 @@ class DecisionLogicFax : public DecisionLogic { bool* reset_decoder) override; private: - DISALLOW_COPY_AND_ASSIGN(DecisionLogicFax); + RTC_DISALLOW_COPY_AND_ASSIGN(DecisionLogicFax); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h index 786740747c..7465906a38 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h @@ -99,7 +99,7 @@ class DecisionLogicNormal : public DecisionLogic { // Checks if num_consecutive_expands_ >= kMaxWaitForPacket. bool MaxWaitForPacket() const; - DISALLOW_COPY_AND_ASSIGN(DecisionLogicNormal); + RTC_DISALLOW_COPY_AND_ASSIGN(DecisionLogicNormal); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.h b/webrtc/modules/audio_coding/neteq/decoder_database.h index 1dbc685c37..8ce0b696e7 100644 --- a/webrtc/modules/audio_coding/neteq/decoder_database.h +++ b/webrtc/modules/audio_coding/neteq/decoder_database.h @@ -147,7 +147,7 @@ class DecoderDatabase { int active_decoder_; int active_cng_decoder_; - DISALLOW_COPY_AND_ASSIGN(DecoderDatabase); + RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/delay_manager.h b/webrtc/modules/audio_coding/neteq/delay_manager.h index b0d3f2e4e8..785fced15d 100644 --- a/webrtc/modules/audio_coding/neteq/delay_manager.h +++ b/webrtc/modules/audio_coding/neteq/delay_manager.h @@ -157,7 +157,7 @@ class DelayManager { DelayPeakDetector& peak_detector_; int last_pack_cng_or_dtmf_; - DISALLOW_COPY_AND_ASSIGN(DelayManager); + RTC_DISALLOW_COPY_AND_ASSIGN(DelayManager); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h index bf8ab744a1..69433b4524 100644 --- a/webrtc/modules/audio_coding/neteq/delay_peak_detector.h +++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h @@ -69,7 +69,7 @@ class DelayPeakDetector { int peak_detection_threshold_; int peak_period_counter_ms_; - DISALLOW_COPY_AND_ASSIGN(DelayPeakDetector); + RTC_DISALLOW_COPY_AND_ASSIGN(DelayPeakDetector); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/dsp_helper.h b/webrtc/modules/audio_coding/neteq/dsp_helper.h index c40d10ad0a..269c2eb0f2 100644 --- a/webrtc/modules/audio_coding/neteq/dsp_helper.h +++ b/webrtc/modules/audio_coding/neteq/dsp_helper.h @@ -130,7 +130,7 @@ class DspHelper { // Table of constants used in method DspHelper::ParabolicFit(). static const int16_t kParabolaCoefficients[17][3]; - DISALLOW_COPY_AND_ASSIGN(DspHelper); + RTC_DISALLOW_COPY_AND_ASSIGN(DspHelper); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h index 861a948627..1f415ce81f 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_buffer.h +++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h @@ -107,7 +107,7 @@ class DtmfBuffer { DtmfList buffer_; - DISALLOW_COPY_AND_ASSIGN(DtmfBuffer); + RTC_DISALLOW_COPY_AND_ASSIGN(DtmfBuffer); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h index 767f66c797..36d902ad3f 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h +++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h @@ -48,7 +48,7 @@ class DtmfToneGenerator { int16_t sample_history1_[2]; // Last 2 samples for the 1st oscillator. int16_t sample_history2_[2]; // Last 2 samples for the 2nd oscillator. - DISALLOW_COPY_AND_ASSIGN(DtmfToneGenerator); + RTC_DISALLOW_COPY_AND_ASSIGN(DtmfToneGenerator); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/expand.h b/webrtc/modules/audio_coding/neteq/expand.h index 37e58d6fac..25c8c21bdb 100644 --- a/webrtc/modules/audio_coding/neteq/expand.h +++ b/webrtc/modules/audio_coding/neteq/expand.h @@ -140,7 +140,7 @@ class Expand { size_t expand_duration_samples_; rtc::scoped_ptr channel_parameters_; - DISALLOW_COPY_AND_ASSIGN(Expand); + RTC_DISALLOW_COPY_AND_ASSIGN(Expand); }; struct ExpandFactory { diff --git a/webrtc/modules/audio_coding/neteq/interface/neteq.h b/webrtc/modules/audio_coding/neteq/interface/neteq.h index 54458b92e2..48e8fd5cde 100644 --- a/webrtc/modules/audio_coding/neteq/interface/neteq.h +++ b/webrtc/modules/audio_coding/neteq/interface/neteq.h @@ -281,7 +281,7 @@ class NetEq { NetEq() {} private: - DISALLOW_COPY_AND_ASSIGN(NetEq); + RTC_DISALLOW_COPY_AND_ASSIGN(NetEq); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/merge.h b/webrtc/modules/audio_coding/neteq/merge.h index 727e9a6020..a168502c27 100644 --- a/webrtc/modules/audio_coding/neteq/merge.h +++ b/webrtc/modules/audio_coding/neteq/merge.h @@ -96,7 +96,7 @@ class Merge { int16_t input_downsampled_[kInputDownsampLength]; AudioMultiVector expanded_; - DISALLOW_COPY_AND_ASSIGN(Merge); + RTC_DISALLOW_COPY_AND_ASSIGN(Merge); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h index fca1c2d6ee..8cf89c083d 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h @@ -43,7 +43,7 @@ class ExternalPcm16B : public AudioDecoder { size_t Channels() const override { return 1; } private: - DISALLOW_COPY_AND_ASSIGN(ExternalPcm16B); + RTC_DISALLOW_COPY_AND_ASSIGN(ExternalPcm16B); }; // Create a mock of ExternalPcm16B which delegates all calls to the real object. diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h index 6a45db6db9..effecba920 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl.h +++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h @@ -399,7 +399,7 @@ class NetEqImpl : public webrtc::NetEq { uint32_t decoded_packet_timestamp_ GUARDED_BY(crit_sect_); private: - DISALLOW_COPY_AND_ASSIGN(NetEqImpl); + RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/normal.h b/webrtc/modules/audio_coding/neteq/normal.h index aa24b528af..23887f5134 100644 --- a/webrtc/modules/audio_coding/neteq/normal.h +++ b/webrtc/modules/audio_coding/neteq/normal.h @@ -61,7 +61,7 @@ class Normal { const BackgroundNoise& background_noise_; Expand* expand_; - DISALLOW_COPY_AND_ASSIGN(Normal); + RTC_DISALLOW_COPY_AND_ASSIGN(Normal); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer.h b/webrtc/modules/audio_coding/neteq/packet_buffer.h index 737845e8ca..03c11e61b6 100644 --- a/webrtc/modules/audio_coding/neteq/packet_buffer.h +++ b/webrtc/modules/audio_coding/neteq/packet_buffer.h @@ -148,7 +148,7 @@ class PacketBuffer { private: size_t max_number_of_packets_; PacketList buffer_; - DISALLOW_COPY_AND_ASSIGN(PacketBuffer); + RTC_DISALLOW_COPY_AND_ASSIGN(PacketBuffer); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/payload_splitter.h b/webrtc/modules/audio_coding/neteq/payload_splitter.h index 6023d4e007..b0c4b5fe5c 100644 --- a/webrtc/modules/audio_coding/neteq/payload_splitter.h +++ b/webrtc/modules/audio_coding/neteq/payload_splitter.h @@ -83,7 +83,7 @@ class PayloadSplitter { uint32_t timestamps_per_frame, PacketList* new_packets); - DISALLOW_COPY_AND_ASSIGN(PayloadSplitter); + RTC_DISALLOW_COPY_AND_ASSIGN(PayloadSplitter); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/post_decode_vad.h b/webrtc/modules/audio_coding/neteq/post_decode_vad.h index 2886cf9138..7bf5ad1383 100644 --- a/webrtc/modules/audio_coding/neteq/post_decode_vad.h +++ b/webrtc/modules/audio_coding/neteq/post_decode_vad.h @@ -65,7 +65,7 @@ class PostDecodeVad { int sid_interval_counter_; ::VadInst* vad_instance_; - DISALLOW_COPY_AND_ASSIGN(PostDecodeVad); + RTC_DISALLOW_COPY_AND_ASSIGN(PostDecodeVad); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/preemptive_expand.h b/webrtc/modules/audio_coding/neteq/preemptive_expand.h index ca48e19787..c4c236080c 100644 --- a/webrtc/modules/audio_coding/neteq/preemptive_expand.h +++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.h @@ -70,7 +70,7 @@ class PreemptiveExpand : public TimeStretch { size_t old_data_length_per_channel_; size_t overlap_samples_; - DISALLOW_COPY_AND_ASSIGN(PreemptiveExpand); + RTC_DISALLOW_COPY_AND_ASSIGN(PreemptiveExpand); }; struct PreemptiveExpandFactory { diff --git a/webrtc/modules/audio_coding/neteq/random_vector.h b/webrtc/modules/audio_coding/neteq/random_vector.h index 8c75eae924..61651e57c2 100644 --- a/webrtc/modules/audio_coding/neteq/random_vector.h +++ b/webrtc/modules/audio_coding/neteq/random_vector.h @@ -43,7 +43,7 @@ class RandomVector { uint32_t seed_; int16_t seed_increment_; - DISALLOW_COPY_AND_ASSIGN(RandomVector); + RTC_DISALLOW_COPY_AND_ASSIGN(RandomVector); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/rtcp.h b/webrtc/modules/audio_coding/neteq/rtcp.h index 2a765efa58..5235397ba3 100644 --- a/webrtc/modules/audio_coding/neteq/rtcp.h +++ b/webrtc/modules/audio_coding/neteq/rtcp.h @@ -51,7 +51,7 @@ class Rtcp { uint32_t jitter_; // Current jitter value. int32_t transit_; // Clock difference for previous packet. - DISALLOW_COPY_AND_ASSIGN(Rtcp); + RTC_DISALLOW_COPY_AND_ASSIGN(Rtcp); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.h b/webrtc/modules/audio_coding/neteq/statistics_calculator.h index 5bb66b6697..08235df429 100644 --- a/webrtc/modules/audio_coding/neteq/statistics_calculator.h +++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.h @@ -160,7 +160,7 @@ class StatisticsCalculator { PeriodicUmaCount delayed_packet_outage_counter_; PeriodicUmaAverage excess_buffer_delay_; - DISALLOW_COPY_AND_ASSIGN(StatisticsCalculator); + RTC_DISALLOW_COPY_AND_ASSIGN(StatisticsCalculator); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer.h b/webrtc/modules/audio_coding/neteq/sync_buffer.h index bbb494e996..38e7887794 100644 --- a/webrtc/modules/audio_coding/neteq/sync_buffer.h +++ b/webrtc/modules/audio_coding/neteq/sync_buffer.h @@ -92,7 +92,7 @@ class SyncBuffer : public AudioMultiVector { uint32_t end_timestamp_; // The timestamp of the last sample in the buffer. size_t dtmf_index_; // Index to the first non-DTMF sample in the buffer. - DISALLOW_COPY_AND_ASSIGN(SyncBuffer); + RTC_DISALLOW_COPY_AND_ASSIGN(SyncBuffer); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/time_stretch.h b/webrtc/modules/audio_coding/neteq/time_stretch.h index 14383d8dd7..00a141508b 100644 --- a/webrtc/modules/audio_coding/neteq/time_stretch.h +++ b/webrtc/modules/audio_coding/neteq/time_stretch.h @@ -109,7 +109,7 @@ class TimeStretch { bool SpeechDetection(int32_t vec1_energy, int32_t vec2_energy, size_t peak_index, int scaling) const; - DISALLOW_COPY_AND_ASSIGN(TimeStretch); + RTC_DISALLOW_COPY_AND_ASSIGN(TimeStretch); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler.h b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h index fcbb7737a4..9129d843bf 100644 --- a/webrtc/modules/audio_coding/neteq/timestamp_scaler.h +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h @@ -61,7 +61,7 @@ class TimestampScaler { uint32_t internal_ref_; const DecoderDatabase& decoder_database_; - DISALLOW_COPY_AND_ASSIGN(TimestampScaler); + RTC_DISALLOW_COPY_AND_ASSIGN(TimestampScaler); }; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h b/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h index b4a6a817b4..a302cff908 100644 --- a/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h +++ b/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h @@ -51,7 +51,7 @@ class AudioChecksum : public AudioSink { char checksum_result_[rtc::Md5Digest::kSize]; bool finished_; - DISALLOW_COPY_AND_ASSIGN(AudioChecksum); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioChecksum); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_loop.h b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h index 87ff688738..a897ee5aef 100644 --- a/webrtc/modules/audio_coding/neteq/tools/audio_loop.h +++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h @@ -51,7 +51,7 @@ class AudioLoop { size_t block_length_samples_; rtc::scoped_ptr audio_array_; - DISALLOW_COPY_AND_ASSIGN(AudioLoop); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioLoop); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_sink.h b/webrtc/modules/audio_coding/neteq/tools/audio_sink.h index b7b3ed1115..3bd2df5ca8 100644 --- a/webrtc/modules/audio_coding/neteq/tools/audio_sink.h +++ b/webrtc/modules/audio_coding/neteq/tools/audio_sink.h @@ -38,7 +38,7 @@ class AudioSink { } private: - DISALLOW_COPY_AND_ASSIGN(AudioSink); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioSink); }; // Forks the output audio to two AudioSink objects. @@ -56,7 +56,7 @@ class AudioSinkFork : public AudioSink { AudioSink* left_sink_; AudioSink* right_sink_; - DISALLOW_COPY_AND_ASSIGN(AudioSinkFork); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioSinkFork); }; } // namespace test } // namespace webrtc diff --git a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h b/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h index b780fbfac1..6972303541 100644 --- a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h @@ -49,7 +49,7 @@ class ConstantPcmPacketSource : public PacketSource { uint32_t timestamp_; const uint32_t payload_ssrc_; - DISALLOW_COPY_AND_ASSIGN(ConstantPcmPacketSource); + RTC_DISALLOW_COPY_AND_ASSIGN(ConstantPcmPacketSource); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h index fae55733f4..a6e12db24d 100644 --- a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h @@ -50,7 +50,7 @@ class InputAudioFile { private: FILE* fp_; - DISALLOW_COPY_AND_ASSIGN(InputAudioFile); + RTC_DISALLOW_COPY_AND_ASSIGN(InputAudioFile); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h index ff30f673d5..a9142a63c1 100644 --- a/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h @@ -42,7 +42,7 @@ class OutputAudioFile : public AudioSink { private: FILE* out_file_; - DISALLOW_COPY_AND_ASSIGN(OutputAudioFile); + RTC_DISALLOW_COPY_AND_ASSIGN(OutputAudioFile); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h b/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h index 1b1ed42829..c36c7da983 100644 --- a/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h @@ -35,7 +35,7 @@ class OutputWavFile : public AudioSink { private: WavWriter wav_writer_; - DISALLOW_COPY_AND_ASSIGN(OutputWavFile); + RTC_DISALLOW_COPY_AND_ASSIGN(OutputWavFile); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/packet.h b/webrtc/modules/audio_coding/neteq/tools/packet.h index a4e48d8953..8e43633423 100644 --- a/webrtc/modules/audio_coding/neteq/tools/packet.h +++ b/webrtc/modules/audio_coding/neteq/tools/packet.h @@ -114,7 +114,7 @@ class Packet { double time_ms_; // Used to denote a packet's arrival time. bool valid_header_; // Set by the RtpHeaderParser. - DISALLOW_COPY_AND_ASSIGN(Packet); + RTC_DISALLOW_COPY_AND_ASSIGN(Packet); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/packet_source.h b/webrtc/modules/audio_coding/neteq/tools/packet_source.h index 968400c215..804a94dc49 100644 --- a/webrtc/modules/audio_coding/neteq/tools/packet_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/packet_source.h @@ -46,7 +46,7 @@ class PacketSource { uint32_t ssrc_; // The selected SSRC. All other SSRCs will be discarded. private: - DISALLOW_COPY_AND_ASSIGN(PacketSource); + RTC_DISALLOW_COPY_AND_ASSIGN(PacketSource); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h index b15d46faff..c0af3546b0 100644 --- a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h +++ b/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h @@ -43,7 +43,7 @@ class ResampleInputAudioFile : public InputAudioFile { const int file_rate_hz_; int output_rate_hz_; Resampler resampler_; - DISALLOW_COPY_AND_ASSIGN(ResampleInputAudioFile); + RTC_DISALLOW_COPY_AND_ASSIGN(ResampleInputAudioFile); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h b/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h index d144b516a2..7150bcfe89 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h @@ -61,7 +61,7 @@ class RtcEventLogSource : public PacketSource { rtc::scoped_ptr event_log_; rtc::scoped_ptr parser_; - DISALLOW_COPY_AND_ASSIGN(RtcEventLogSource); + RTC_DISALLOW_COPY_AND_ASSIGN(RtcEventLogSource); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h index d711685950..d0856a819c 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h @@ -55,7 +55,7 @@ class RtpFileSource : public PacketSource { rtc::scoped_ptr rtp_reader_; rtc::scoped_ptr parser_; - DISALLOW_COPY_AND_ASSIGN(RtpFileSource); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpFileSource); }; } // namespace test diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h index e09f6e4ca1..6c16192daa 100644 --- a/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h +++ b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h @@ -54,7 +54,7 @@ class RtpGenerator { double drift_factor_; private: - DISALLOW_COPY_AND_ASSIGN(RtpGenerator); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpGenerator); }; class TimestampJumpRtpGenerator : public RtpGenerator { @@ -75,7 +75,7 @@ class TimestampJumpRtpGenerator : public RtpGenerator { private: uint32_t jump_from_timestamp_; uint32_t jump_to_timestamp_; - DISALLOW_COPY_AND_ASSIGN(TimestampJumpRtpGenerator); + RTC_DISALLOW_COPY_AND_ASSIGN(TimestampJumpRtpGenerator); }; } // namespace test diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h index f49931e8bf..2d8fafa04b 100644 --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -119,7 +119,7 @@ class LateBindingSymbolTable { bool undefined_symbols_; void *symbols_[SYMBOL_TABLE_SIZE]; - DISALLOW_COPY_AND_ASSIGN(LateBindingSymbolTable); + RTC_DISALLOW_COPY_AND_ASSIGN(LateBindingSymbolTable); }; // This macro must be invoked in a header to declare a symbol table class. diff --git a/webrtc/modules/audio_processing/beamformer/matrix.h b/webrtc/modules/audio_processing/beamformer/matrix.h index 1a961aff07..442ddcecd1 100644 --- a/webrtc/modules/audio_processing/beamformer/matrix.h +++ b/webrtc/modules/audio_processing/beamformer/matrix.h @@ -360,7 +360,7 @@ class Matrix { return *this; } - DISALLOW_COPY_AND_ASSIGN(Matrix); + RTC_DISALLOW_COPY_AND_ASSIGN(Matrix); }; } // namespace webrtc diff --git a/webrtc/modules/audio_processing/test/test_utils.h b/webrtc/modules/audio_processing/test/test_utils.h index 7ad462c095..8dd380b15d 100644 --- a/webrtc/modules/audio_processing/test/test_utils.h +++ b/webrtc/modules/audio_processing/test/test_utils.h @@ -40,7 +40,7 @@ class RawFile final { private: FILE* file_handle_; - DISALLOW_COPY_AND_ASSIGN(RawFile); + RTC_DISALLOW_COPY_AND_ASSIGN(RawFile); }; void WriteIntData(const int16_t* data, diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h index a0131e23e2..a33a0e6f04 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h +++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h @@ -80,7 +80,7 @@ class BitrateControllerImpl : public BitrateController { int64_t last_rtt_ms_ GUARDED_BY(critsect_); uint32_t last_reserved_bitrate_bps_ GUARDED_BY(critsect_); - DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl); }; } // namespace webrtc #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ diff --git a/webrtc/modules/desktop_capture/cropped_desktop_frame.cc b/webrtc/modules/desktop_capture/cropped_desktop_frame.cc index 9ab6fe9c7c..2c709733e1 100644 --- a/webrtc/modules/desktop_capture/cropped_desktop_frame.cc +++ b/webrtc/modules/desktop_capture/cropped_desktop_frame.cc @@ -20,7 +20,7 @@ class CroppedDesktopFrame : public DesktopFrame { private: rtc::scoped_ptr frame_; - DISALLOW_COPY_AND_ASSIGN(CroppedDesktopFrame); + RTC_DISALLOW_COPY_AND_ASSIGN(CroppedDesktopFrame); }; DesktopFrame* diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc index f5a7fe8279..74d25d4e1f 100644 --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc @@ -67,7 +67,7 @@ class DesktopFrameWithCursor : public DesktopFrame { DesktopVector restore_position_; rtc::scoped_ptr restore_frame_; - DISALLOW_COPY_AND_ASSIGN(DesktopFrameWithCursor); + RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrameWithCursor); }; DesktopFrameWithCursor::DesktopFrameWithCursor(DesktopFrame* frame, diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h index b16cf4584f..7a72031c79 100644 --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h @@ -55,7 +55,7 @@ class DesktopAndCursorComposer : public DesktopCapturer, MouseCursorMonitor::CursorState cursor_state_; DesktopVector cursor_position_; - DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer); + RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/desktop_frame.h b/webrtc/modules/desktop_capture/desktop_frame.h index d7376b481a..49b964630c 100644 --- a/webrtc/modules/desktop_capture/desktop_frame.h +++ b/webrtc/modules/desktop_capture/desktop_frame.h @@ -91,7 +91,7 @@ class DesktopFrame { rtc::scoped_ptr shape_; private: - DISALLOW_COPY_AND_ASSIGN(DesktopFrame); + RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrame); }; // A DesktopFrame that stores data in the heap. @@ -104,7 +104,7 @@ class BasicDesktopFrame : public DesktopFrame { static DesktopFrame* CopyOf(const DesktopFrame& frame); private: - DISALLOW_COPY_AND_ASSIGN(BasicDesktopFrame); + RTC_DISALLOW_COPY_AND_ASSIGN(BasicDesktopFrame); }; // A DesktopFrame that stores data in shared memory. @@ -117,7 +117,7 @@ class SharedMemoryDesktopFrame : public DesktopFrame { ~SharedMemoryDesktopFrame() override; private: - DISALLOW_COPY_AND_ASSIGN(SharedMemoryDesktopFrame); + RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemoryDesktopFrame); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/desktop_frame_win.h b/webrtc/modules/desktop_capture/desktop_frame_win.h index 9530fdc89b..15b5883c36 100644 --- a/webrtc/modules/desktop_capture/desktop_frame_win.h +++ b/webrtc/modules/desktop_capture/desktop_frame_win.h @@ -40,7 +40,7 @@ class DesktopFrameWin : public DesktopFrame { HBITMAP bitmap_; rtc::scoped_ptr owned_shared_memory_; - DISALLOW_COPY_AND_ASSIGN(DesktopFrameWin); + RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrameWin); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/differ.h b/webrtc/modules/desktop_capture/differ.h index 224c6913af..b3b0e7c244 100644 --- a/webrtc/modules/desktop_capture/differ.h +++ b/webrtc/modules/desktop_capture/differ.h @@ -81,7 +81,7 @@ class Differ { int diff_info_height_; int diff_info_size_; - DISALLOW_COPY_AND_ASSIGN(Differ); + RTC_DISALLOW_COPY_AND_ASSIGN(Differ); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/differ_unittest.cc b/webrtc/modules/desktop_capture/differ_unittest.cc index 3b6f859a7c..642cb37448 100644 --- a/webrtc/modules/desktop_capture/differ_unittest.cc +++ b/webrtc/modules/desktop_capture/differ_unittest.cc @@ -204,7 +204,7 @@ class DifferTest : public testing::Test { rtc::scoped_ptr curr_; private: - DISALLOW_COPY_AND_ASSIGN(DifferTest); + RTC_DISALLOW_COPY_AND_ASSIGN(DifferTest); }; TEST_F(DifferTest, Setup) { diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h index bd502f0815..fe6f01beb9 100644 --- a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h +++ b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h @@ -58,7 +58,7 @@ class DesktopConfigurationMonitor { MacDesktopConfiguration desktop_configuration_; rtc::scoped_ptr display_configuration_capture_event_; - DISALLOW_COPY_AND_ASSIGN(DesktopConfigurationMonitor); + RTC_DISALLOW_COPY_AND_ASSIGN(DesktopConfigurationMonitor); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h index b24fc997e4..bddc8099b2 100644 --- a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h +++ b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h @@ -61,7 +61,7 @@ class FullScreenChromeWindowDetector { WindowCapturer::WindowList previous_window_list_; TickTime last_udpate_time_; - DISALLOW_COPY_AND_ASSIGN(FullScreenChromeWindowDetector); + RTC_DISALLOW_COPY_AND_ASSIGN(FullScreenChromeWindowDetector); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h b/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h index 4d1dd1ffd6..a32d470954 100644 --- a/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h +++ b/webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h @@ -33,7 +33,7 @@ class ScopedPixelBufferObject { CGLContextObj cgl_context_; GLuint pixel_buffer_object_; - DISALLOW_COPY_AND_ASSIGN(ScopedPixelBufferObject); + RTC_DISALLOW_COPY_AND_ASSIGN(ScopedPixelBufferObject); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/mouse_cursor.h b/webrtc/modules/desktop_capture/mouse_cursor.h index 1da98a4905..dd5dc0eb44 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor.h +++ b/webrtc/modules/desktop_capture/mouse_cursor.h @@ -40,7 +40,7 @@ class MouseCursor { rtc::scoped_ptr image_; DesktopVector hotspot_; - DISALLOW_COPY_AND_ASSIGN(MouseCursor); + RTC_DISALLOW_COPY_AND_ASSIGN(MouseCursor); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/screen_capture_frame_queue.h b/webrtc/modules/desktop_capture/screen_capture_frame_queue.h index f3b11cfbff..6cd9e3bfc8 100644 --- a/webrtc/modules/desktop_capture/screen_capture_frame_queue.h +++ b/webrtc/modules/desktop_capture/screen_capture_frame_queue.h @@ -66,7 +66,7 @@ class ScreenCaptureFrameQueue { static const int kQueueLength = 2; rtc::scoped_ptr frames_[kQueueLength]; - DISALLOW_COPY_AND_ASSIGN(ScreenCaptureFrameQueue); + RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCaptureFrameQueue); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/screen_capturer_helper.h b/webrtc/modules/desktop_capture/screen_capturer_helper.h index a8be989791..cc60203da0 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_helper.h +++ b/webrtc/modules/desktop_capture/screen_capturer_helper.h @@ -80,7 +80,7 @@ class ScreenCapturerHelper { // If the value is <= 0, then the invalid region is not expanded to a grid. int log_grid_size_; - DISALLOW_COPY_AND_ASSIGN(ScreenCapturerHelper); + RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerHelper); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac.mm b/webrtc/modules/desktop_capture/screen_capturer_mac.mm index ceb078145d..8da56d2f76 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_mac.mm +++ b/webrtc/modules/desktop_capture/screen_capturer_mac.mm @@ -280,7 +280,7 @@ class ScreenCapturerMac : public ScreenCapturer { CGWindowID excluded_window_; - DISALLOW_COPY_AND_ASSIGN(ScreenCapturerMac); + RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerMac); }; // DesktopFrame wrapper that flips wrapped frame upside down by inverting @@ -303,7 +303,7 @@ class InvertedDesktopFrame : public DesktopFrame { private: rtc::scoped_ptr original_frame_; - DISALLOW_COPY_AND_ASSIGN(InvertedDesktopFrame); + RTC_DISALLOW_COPY_AND_ASSIGN(InvertedDesktopFrame); }; ScreenCapturerMac::ScreenCapturerMac( diff --git a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h index 373e66f7bd..8b83f41252 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h +++ b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h @@ -27,7 +27,7 @@ class MockScreenCapturer : public ScreenCapturer { MOCK_METHOD1(SelectScreen, bool(ScreenId id)); private: - DISALLOW_COPY_AND_ASSIGN(MockScreenCapturer); + RTC_DISALLOW_COPY_AND_ASSIGN(MockScreenCapturer); }; class MockScreenCapturerCallback : public ScreenCapturer::Callback { @@ -39,7 +39,7 @@ class MockScreenCapturerCallback : public ScreenCapturer::Callback { MOCK_METHOD1(OnCaptureCompleted, void(DesktopFrame*)); private: - DISALLOW_COPY_AND_ASSIGN(MockScreenCapturerCallback); + RTC_DISALLOW_COPY_AND_ASSIGN(MockScreenCapturerCallback); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc index 606c06153d..a3cf6d93cc 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc @@ -51,7 +51,7 @@ class FakeSharedMemory : public SharedMemory { } private: char* buffer_; - DISALLOW_COPY_AND_ASSIGN(FakeSharedMemory); + RTC_DISALLOW_COPY_AND_ASSIGN(FakeSharedMemory); }; SharedMemory* ScreenCapturerTest::CreateSharedMemory(size_t size) { diff --git a/webrtc/modules/desktop_capture/screen_capturer_x11.cc b/webrtc/modules/desktop_capture/screen_capturer_x11.cc index 1597e3fb61..714583b0bb 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_x11.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_x11.cc @@ -121,7 +121,7 @@ class ScreenCapturerLinux : public ScreenCapturer, // |Differ| for use when polling for changes. rtc::scoped_ptr differ_; - DISALLOW_COPY_AND_ASSIGN(ScreenCapturerLinux); + RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerLinux); }; ScreenCapturerLinux::ScreenCapturerLinux() diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.cc b/webrtc/modules/desktop_capture/shared_desktop_frame.cc index 7651816473..97190e0473 100644 --- a/webrtc/modules/desktop_capture/shared_desktop_frame.cc +++ b/webrtc/modules/desktop_capture/shared_desktop_frame.cc @@ -41,7 +41,7 @@ class SharedDesktopFrame::Core { Atomic32 ref_count_; rtc::scoped_ptr frame_; - DISALLOW_COPY_AND_ASSIGN(Core); + RTC_DISALLOW_COPY_AND_ASSIGN(Core); }; SharedDesktopFrame::~SharedDesktopFrame() {} diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.h b/webrtc/modules/desktop_capture/shared_desktop_frame.h index 12d373a0f3..7d18db153c 100644 --- a/webrtc/modules/desktop_capture/shared_desktop_frame.h +++ b/webrtc/modules/desktop_capture/shared_desktop_frame.h @@ -41,7 +41,7 @@ class SharedDesktopFrame : public DesktopFrame { rtc::scoped_refptr core_; - DISALLOW_COPY_AND_ASSIGN(SharedDesktopFrame); + RTC_DISALLOW_COPY_AND_ASSIGN(SharedDesktopFrame); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/shared_memory.h b/webrtc/modules/desktop_capture/shared_memory.h index 7870d833f1..631f119b5f 100644 --- a/webrtc/modules/desktop_capture/shared_memory.h +++ b/webrtc/modules/desktop_capture/shared_memory.h @@ -59,7 +59,7 @@ class SharedMemory { const int id_; private: - DISALLOW_COPY_AND_ASSIGN(SharedMemory); + RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemory); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/win/desktop.h b/webrtc/modules/desktop_capture/win/desktop.h index 0f3e64d05d..dc3b8c61b9 100644 --- a/webrtc/modules/desktop_capture/win/desktop.h +++ b/webrtc/modules/desktop_capture/win/desktop.h @@ -56,7 +56,7 @@ class Desktop { // True if |desktop_| must be closed on teardown. bool own_; - DISALLOW_COPY_AND_ASSIGN(Desktop); + RTC_DISALLOW_COPY_AND_ASSIGN(Desktop); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/win/scoped_gdi_object.h b/webrtc/modules/desktop_capture/win/scoped_gdi_object.h index 366df6d4ff..1cac63e43d 100644 --- a/webrtc/modules/desktop_capture/win/scoped_gdi_object.h +++ b/webrtc/modules/desktop_capture/win/scoped_gdi_object.h @@ -56,7 +56,7 @@ class ScopedGDIObject { private: T handle_; - DISALLOW_COPY_AND_ASSIGN(ScopedGDIObject); + RTC_DISALLOW_COPY_AND_ASSIGN(ScopedGDIObject); }; // The traits class that uses DeleteObject() to close a handle. @@ -70,7 +70,7 @@ class DeleteObjectTraits { } private: - DISALLOW_IMPLICIT_CONSTRUCTORS(DeleteObjectTraits); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DeleteObjectTraits); }; // The traits class that uses DestroyCursor() to close a handle. @@ -83,7 +83,7 @@ class DestroyCursorTraits { } private: - DISALLOW_IMPLICIT_CONSTRUCTORS(DestroyCursorTraits); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DestroyCursorTraits); }; typedef ScopedGDIObject > ScopedBitmap; diff --git a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h index 7566e6a0e1..df8652ac9d 100644 --- a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h +++ b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h @@ -45,7 +45,7 @@ class ScopedThreadDesktop { // The desktop handle assigned to the calling thread at creation. rtc::scoped_ptr initial_; - DISALLOW_COPY_AND_ASSIGN(ScopedThreadDesktop); + RTC_DISALLOW_COPY_AND_ASSIGN(ScopedThreadDesktop); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h index 6014a1810e..202b9aaa87 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h @@ -81,7 +81,7 @@ class ScreenCapturerWinGdi : public ScreenCapturer { // Used to suppress duplicate logging of SetThreadExecutionState errors. bool set_thread_execution_state_failed_; - DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinGdi); + RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinGdi); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h index b33b873430..9ad6b58d9b 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h @@ -145,7 +145,7 @@ class ScreenCapturerWinMagnifier : public ScreenCapturer { // successfully. Reset at the beginning of each CaptureImage call. bool magnifier_capture_succeeded_; - DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinMagnifier); + RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinMagnifier); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/win/window_capture_utils.h b/webrtc/modules/desktop_capture/win/window_capture_utils.h index aa89c12a9a..7c80490f60 100644 --- a/webrtc/modules/desktop_capture/win/window_capture_utils.h +++ b/webrtc/modules/desktop_capture/win/window_capture_utils.h @@ -34,7 +34,7 @@ class AeroChecker { HMODULE dwmapi_library_; DwmIsCompositionEnabledFunc func_; - DISALLOW_COPY_AND_ASSIGN(AeroChecker); + RTC_DISALLOW_COPY_AND_ASSIGN(AeroChecker); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/window_capturer_mac.mm b/webrtc/modules/desktop_capture/window_capturer_mac.mm index 3acca67cb0..ecf6beeb2a 100644 --- a/webrtc/modules/desktop_capture/window_capturer_mac.mm +++ b/webrtc/modules/desktop_capture/window_capturer_mac.mm @@ -66,7 +66,7 @@ class WindowCapturerMac : public WindowCapturer { rtc::scoped_refptr full_screen_chrome_window_detector_; - DISALLOW_COPY_AND_ASSIGN(WindowCapturerMac); + RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerMac); }; WindowCapturerMac::WindowCapturerMac(rtc::scoped_refptr< diff --git a/webrtc/modules/desktop_capture/window_capturer_null.cc b/webrtc/modules/desktop_capture/window_capturer_null.cc index d9ad0ca0b1..b74f17e39b 100755 --- a/webrtc/modules/desktop_capture/window_capturer_null.cc +++ b/webrtc/modules/desktop_capture/window_capturer_null.cc @@ -35,7 +35,7 @@ class WindowCapturerNull : public WindowCapturer { private: Callback* callback_; - DISALLOW_COPY_AND_ASSIGN(WindowCapturerNull); + RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerNull); }; WindowCapturerNull::WindowCapturerNull() diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/webrtc/modules/desktop_capture/window_capturer_win.cc index 3d96881969..ba45eaa9d1 100644 --- a/webrtc/modules/desktop_capture/window_capturer_win.cc +++ b/webrtc/modules/desktop_capture/window_capturer_win.cc @@ -89,7 +89,7 @@ class WindowCapturerWin : public WindowCapturer { AeroChecker aero_checker_; - DISALLOW_COPY_AND_ASSIGN(WindowCapturerWin); + RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerWin); }; WindowCapturerWin::WindowCapturerWin() diff --git a/webrtc/modules/desktop_capture/window_capturer_x11.cc b/webrtc/modules/desktop_capture/window_capturer_x11.cc index 356830568d..76c95eba47 100755 --- a/webrtc/modules/desktop_capture/window_capturer_x11.cc +++ b/webrtc/modules/desktop_capture/window_capturer_x11.cc @@ -82,7 +82,7 @@ class XWindowProperty { unsigned long size_; // NOLINT: type required by XGetWindowProperty unsigned char* data_; - DISALLOW_COPY_AND_ASSIGN(XWindowProperty); + RTC_DISALLOW_COPY_AND_ASSIGN(XWindowProperty); }; class WindowCapturerLinux : public WindowCapturer, @@ -129,7 +129,7 @@ class WindowCapturerLinux : public WindowCapturer, ::Window selected_window_; XServerPixelBuffer x_server_pixel_buffer_; - DISALLOW_COPY_AND_ASSIGN(WindowCapturerLinux); + RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerLinux); }; WindowCapturerLinux::WindowCapturerLinux(const DesktopCaptureOptions& options) diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.h b/webrtc/modules/desktop_capture/x11/shared_x_display.h index 11c5bf4482..02755450fc 100644 --- a/webrtc/modules/desktop_capture/x11/shared_x_display.h +++ b/webrtc/modules/desktop_capture/x11/shared_x_display.h @@ -76,7 +76,7 @@ class SharedXDisplay { EventHandlersMap event_handlers_; - DISALLOW_COPY_AND_ASSIGN(SharedXDisplay); + RTC_DISALLOW_COPY_AND_ASSIGN(SharedXDisplay); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/x11/x_error_trap.h b/webrtc/modules/desktop_capture/x11/x_error_trap.h index aa771145d5..f1f6e11c63 100644 --- a/webrtc/modules/desktop_capture/x11/x_error_trap.h +++ b/webrtc/modules/desktop_capture/x11/x_error_trap.h @@ -31,7 +31,7 @@ class XErrorTrap { XErrorHandler original_error_handler_; bool enabled_; - DISALLOW_COPY_AND_ASSIGN(XErrorTrap); + RTC_DISALLOW_COPY_AND_ASSIGN(XErrorTrap); }; } // namespace webrtc diff --git a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h index 98f263f3a8..d1e6632f08 100644 --- a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h +++ b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h @@ -77,7 +77,7 @@ class XServerPixelBuffer { Pixmap shm_pixmap_; GC shm_gc_; - DISALLOW_COPY_AND_ASSIGN(XServerPixelBuffer); + RTC_DISALLOW_COPY_AND_ASSIGN(XServerPixelBuffer); }; } // namespace webrtc diff --git a/webrtc/modules/interface/module_common_types.h b/webrtc/modules/interface/module_common_types.h index b371e47d05..67019cafaf 100644 --- a/webrtc/modules/interface/module_common_types.h +++ b/webrtc/modules/interface/module_common_types.h @@ -392,7 +392,7 @@ class RTPFragmentationHeader { uint8_t* fragmentationPlType; // Payload type of each fragmentation private: - DISALLOW_COPY_AND_ASSIGN(RTPFragmentationHeader); + RTC_DISALLOW_COPY_AND_ASSIGN(RTPFragmentationHeader); }; struct RTCPVoIPMetric { @@ -542,7 +542,7 @@ class AudioFrame { bool interleaved_; private: - DISALLOW_COPY_AND_ASSIGN(AudioFrame); + RTC_DISALLOW_COPY_AND_ASSIGN(AudioFrame); }; inline AudioFrame::AudioFrame() diff --git a/webrtc/modules/pacing/include/packet_router.h b/webrtc/modules/pacing/include/packet_router.h index c181ec094a..d0bcf558f6 100644 --- a/webrtc/modules/pacing/include/packet_router.h +++ b/webrtc/modules/pacing/include/packet_router.h @@ -56,7 +56,7 @@ class PacketRouter : public PacedSender::Callback { volatile int transport_seq_; - DISALLOW_COPY_AND_ASSIGN(PacketRouter); + RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter); }; } // namespace webrtc #endif // WEBRTC_MODULES_PACING_INCLUDE_PACKET_ROUTER_H_ diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h index b8c47a4b55..696b7806f1 100644 --- a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h +++ b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h @@ -82,7 +82,7 @@ class AimdRateControl { int64_t time_of_last_log_; bool in_experiment_; - DISALLOW_IMPLICIT_CONSTRUCTORS(AimdRateControl); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AimdRateControl); }; } // namespace webrtc diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc index 35b3a862da..9d86ba31be 100644 --- a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc +++ b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc @@ -39,7 +39,7 @@ class BweSimulation : public BweTest, Random random_; private: - DISALLOW_COPY_AND_ASSIGN(BweSimulation); + RTC_DISALLOW_COPY_AND_ASSIGN(BweSimulation); }; INSTANTIATE_TEST_CASE_P(VideoSendersTest, diff --git a/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h b/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h index b01a62bdd7..e104ba661d 100644 --- a/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h +++ b/webrtc/modules/remote_bitrate_estimator/include/send_time_history.h @@ -40,7 +40,7 @@ class SendTimeHistory { uint16_t oldest_sequence_number_; // Oldest may not be lowest. std::map history_; - DISALLOW_COPY_AND_ASSIGN(SendTimeHistory); + RTC_DISALLOW_COPY_AND_ASSIGN(SendTimeHistory); }; } // namespace webrtc diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival.h b/webrtc/modules/remote_bitrate_estimator/inter_arrival.h index ace855118e..427bafcf96 100644 --- a/webrtc/modules/remote_bitrate_estimator/inter_arrival.h +++ b/webrtc/modules/remote_bitrate_estimator/inter_arrival.h @@ -78,7 +78,7 @@ class InterArrival { double timestamp_to_ms_coeff_; bool burst_grouping_; - DISALLOW_IMPLICIT_CONSTRUCTORS(InterArrival); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(InterArrival); }; } // namespace webrtc diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector.h b/webrtc/modules/remote_bitrate_estimator/overuse_detector.h index 5a07b4e19a..bb69a8a0a1 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_detector.h +++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector.h @@ -59,7 +59,7 @@ class OveruseDetector { int overuse_counter_; BandwidthUsage hypothesis_; - DISALLOW_COPY_AND_ASSIGN(OveruseDetector); + RTC_DISALLOW_COPY_AND_ASSIGN(OveruseDetector); }; } // namespace webrtc diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h index 6499d8d043..d671f39166 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h +++ b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h @@ -63,7 +63,7 @@ class OveruseEstimator { double var_noise_; std::list ts_delta_hist_; - DISALLOW_COPY_AND_ASSIGN(OveruseEstimator); + RTC_DISALLOW_COPY_AND_ASSIGN(OveruseEstimator); }; } // namespace webrtc diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h index 1bee6bd1f0..bfbe36a3e4 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h @@ -146,7 +146,7 @@ class RemoteBitrateEstimatorAbsSendTime : public RemoteBitrateEstimator { size_t total_probes_received_; int64_t first_packet_time_ms_; - DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorAbsSendTime); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorAbsSendTime); }; } // namespace webrtc diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc index c2137d806f..692f882466 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc @@ -26,7 +26,7 @@ class RemoteBitrateEstimatorAbsSendTimeTest : kRemoteBitrateEstimatorMinBitrateBps)); } protected: - DISALLOW_COPY_AND_ASSIGN(RemoteBitrateEstimatorAbsSendTimeTest); + RTC_DISALLOW_COPY_AND_ASSIGN(RemoteBitrateEstimatorAbsSendTimeTest); }; TEST_F(RemoteBitrateEstimatorAbsSendTimeTest, InitialBehavior) { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h index 5ca2100b19..6d07ad164c 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h @@ -61,7 +61,7 @@ class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator { int64_t last_process_time_; int64_t process_interval_ms_ GUARDED_BY(crit_sect_.get()); - DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorSingleStream); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorSingleStream); }; } // namespace webrtc diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc index ea4e2688d6..b0d0fe78db 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc @@ -26,7 +26,7 @@ class RemoteBitrateEstimatorSingleTest : kRemoteBitrateEstimatorMinBitrateBps)); } protected: - DISALLOW_COPY_AND_ASSIGN(RemoteBitrateEstimatorSingleTest); + RTC_DISALLOW_COPY_AND_ASSIGN(RemoteBitrateEstimatorSingleTest); }; TEST_F(RemoteBitrateEstimatorSingleTest, InitialBehavior) { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h index 0658ec5fc7..b4fe7139b4 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h @@ -100,7 +100,7 @@ class RtpStream { uint32_t rtp_timestamp_offset_; const double kNtpFracPerMs; - DISALLOW_COPY_AND_ASSIGN(RtpStream); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpStream); }; class StreamGenerator { @@ -138,7 +138,7 @@ class StreamGenerator { // All streams being transmitted on this simulated channel. StreamMap streams_; - DISALLOW_COPY_AND_ASSIGN(StreamGenerator); + RTC_DISALLOW_COPY_AND_ASSIGN(StreamGenerator); }; } // namespace testing @@ -211,7 +211,7 @@ class RemoteBitrateEstimatorTest : public ::testing::Test { rtc::scoped_ptr bitrate_estimator_; rtc::scoped_ptr stream_generator_; - DISALLOW_COPY_AND_ASSIGN(RemoteBitrateEstimatorTest); + RTC_DISALLOW_COPY_AND_ASSIGN(RemoteBitrateEstimatorTest); }; } // namespace webrtc diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc index f02e167c82..d6f049f6ac 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc @@ -256,7 +256,7 @@ class BweFeedbackTest } private: - DISALLOW_COPY_AND_ASSIGN(BweFeedbackTest); + RTC_DISALLOW_COPY_AND_ASSIGN(BweFeedbackTest); }; INSTANTIATE_TEST_CASE_P(VideoSendersTest, diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe.cc index 0e10f045d1..c667b6864e 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe.cc @@ -70,7 +70,7 @@ class NullBweSender : public BweSender { int Process() override { return 0; } private: - DISALLOW_COPY_AND_ASSIGN(NullBweSender); + RTC_DISALLOW_COPY_AND_ASSIGN(NullBweSender); }; int64_t GetAbsSendTimeInMs(uint32_t abs_send_time) { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe.h b/webrtc/modules/remote_bitrate_estimator/test/bwe.h index 72e7f73ad9..ef9b3149d7 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe.h @@ -122,7 +122,7 @@ class BweSender : public Module { int bitrate_kbps_; private: - DISALLOW_COPY_AND_ASSIGN(BweSender); + RTC_DISALLOW_COPY_AND_ASSIGN(BweSender); }; class BweReceiver { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h index 3dca0abc25..5fb3252195 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h @@ -143,7 +143,7 @@ class BweTest { Packets packets_; bool plot_total_available_capacity_; - DISALLOW_COPY_AND_ASSIGN(BweTest); + RTC_DISALLOW_COPY_AND_ASSIGN(BweTest); }; // Default Evaluation parameters: diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc index dbb5ade0b2..d7abede707 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc @@ -94,7 +94,7 @@ class BaseLineFileVerify : public BaseLineFileInterface { rtc::scoped_ptr reader_; bool fail_to_read_response_; - DISALLOW_IMPLICIT_CONSTRUCTORS(BaseLineFileVerify); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BaseLineFileVerify); }; class BaseLineFileUpdate : public BaseLineFileInterface { @@ -146,7 +146,7 @@ class BaseLineFileUpdate : public BaseLineFileInterface { std::vector output_content_; std::string filepath_; - DISALLOW_IMPLICIT_CONSTRUCTORS(BaseLineFileUpdate); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BaseLineFileUpdate); }; BaseLineFileInterface* BaseLineFileInterface::Create( diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h index e73a545e53..2881eba424 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h @@ -35,7 +35,7 @@ class ResourceFileReader { private: explicit ResourceFileReader(FILE* file) : file_(file) {} FILE* file_; - DISALLOW_IMPLICIT_CONSTRUCTORS(ResourceFileReader); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ResourceFileReader); }; class OutputFileWriter { @@ -50,7 +50,7 @@ class OutputFileWriter { private: explicit OutputFileWriter(FILE* file) : file_(file) {} FILE* file_; - DISALLOW_IMPLICIT_CONSTRUCTORS(OutputFileWriter); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(OutputFileWriter); }; } // namespace bwe } // namespace testing diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc index a84d6f0a5c..2870be8b44 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc @@ -44,7 +44,7 @@ class DelayCapHelper { int64_t max_delay_us_; Stats delay_stats_; - DISALLOW_COPY_AND_ASSIGN(DelayCapHelper); + RTC_DISALLOW_COPY_AND_ASSIGN(DelayCapHelper); }; const FlowIds CreateFlowIds(const int *flow_ids_array, size_t num_flow_ids) { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h index ceaa6373ff..3cdf4a9021 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -196,7 +196,7 @@ class Random { uint32_t a_; uint32_t b_; - DISALLOW_IMPLICIT_CONSTRUCTORS(Random); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Random); }; bool IsTimeSorted(const Packets& packets); @@ -245,7 +245,7 @@ class PacketProcessor { PacketProcessorListener* listener_; const FlowIds flow_ids_; - DISALLOW_COPY_AND_ASSIGN(PacketProcessor); + RTC_DISALLOW_COPY_AND_ASSIGN(PacketProcessor); }; class RateCounterFilter : public PacketProcessor { @@ -278,7 +278,7 @@ class RateCounterFilter : public PacketProcessor { // Algorithm name if single flow, Total link utilization if all flows. std::string plot_name_; - DISALLOW_IMPLICIT_CONSTRUCTORS(RateCounterFilter); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RateCounterFilter); }; class LossFilter : public PacketProcessor { @@ -294,7 +294,7 @@ class LossFilter : public PacketProcessor { Random random_; float loss_fraction_; - DISALLOW_IMPLICIT_CONSTRUCTORS(LossFilter); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LossFilter); }; class DelayFilter : public PacketProcessor { @@ -310,7 +310,7 @@ class DelayFilter : public PacketProcessor { int64_t one_way_delay_us_; int64_t last_send_time_us_; - DISALLOW_IMPLICIT_CONSTRUCTORS(DelayFilter); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayFilter); }; class JitterFilter : public PacketProcessor { @@ -330,7 +330,7 @@ class JitterFilter : public PacketProcessor { int64_t last_send_time_us_; bool reordering_; // False by default. - DISALLOW_IMPLICIT_CONSTRUCTORS(JitterFilter); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(JitterFilter); }; // Reorders two consecutive packets with a probability of reorder_percent. @@ -347,7 +347,7 @@ class ReorderFilter : public PacketProcessor { Random random_; float reorder_fraction_; - DISALLOW_IMPLICIT_CONSTRUCTORS(ReorderFilter); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ReorderFilter); }; // Apply a bitrate choke with an infinite queue on the packet stream. @@ -372,7 +372,7 @@ class ChokeFilter : public PacketProcessor { rtc::scoped_ptr delay_cap_helper_; int64_t max_delay_us_; - DISALLOW_IMPLICIT_CONSTRUCTORS(ChokeFilter); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ChokeFilter); }; class TraceBasedDeliveryFilter : public PacketProcessor { @@ -410,7 +410,7 @@ class TraceBasedDeliveryFilter : public PacketProcessor { Stats packets_per_second_stats_; Stats kbps_stats_; - DISALLOW_COPY_AND_ASSIGN(TraceBasedDeliveryFilter); + RTC_DISALLOW_COPY_AND_ASSIGN(TraceBasedDeliveryFilter); }; class VideoSource { @@ -450,7 +450,7 @@ class VideoSource { int64_t start_plotting_ms_; uint32_t previous_bitrate_bps_; - DISALLOW_IMPLICIT_CONSTRUCTORS(VideoSource); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VideoSource); }; class AdaptiveVideoSource : public VideoSource { @@ -465,7 +465,7 @@ class AdaptiveVideoSource : public VideoSource { void SetBitrateBps(int bitrate_bps) override; private: - DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveVideoSource); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveVideoSource); }; class PeriodicKeyFrameSource : public AdaptiveVideoSource { @@ -488,7 +488,7 @@ class PeriodicKeyFrameSource : public AdaptiveVideoSource { uint32_t frame_counter_; int compensation_bytes_; int compensation_per_frame_; - DISALLOW_IMPLICIT_CONSTRUCTORS(PeriodicKeyFrameSource); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PeriodicKeyFrameSource); }; } // namespace bwe } // namespace testing diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc index dc82b91fab..6cd6ee7efe 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc @@ -208,7 +208,7 @@ class BweTestFramework_RateCounterFilterTest : public ::testing::Test { RateCounterFilter filter_; int64_t now_ms_; - DISALLOW_COPY_AND_ASSIGN(BweTestFramework_RateCounterFilterTest); + RTC_DISALLOW_COPY_AND_ASSIGN(BweTestFramework_RateCounterFilterTest); }; TEST_F(BweTestFramework_RateCounterFilterTest, Short) { @@ -382,7 +382,7 @@ class BweTestFramework_DelayFilterTest : public ::testing::Test { int64_t now_ms_; uint16_t sequence_number_; - DISALLOW_COPY_AND_ASSIGN(BweTestFramework_DelayFilterTest); + RTC_DISALLOW_COPY_AND_ASSIGN(BweTestFramework_DelayFilterTest); }; TEST_F(BweTestFramework_DelayFilterTest, Delay0) { @@ -667,7 +667,7 @@ class BweTestFramework_ChokeFilterTest : public ::testing::Test { Packets output_packets_; std::vector send_times_us_; - DISALLOW_COPY_AND_ASSIGN(BweTestFramework_ChokeFilterTest); + RTC_DISALLOW_COPY_AND_ASSIGN(BweTestFramework_ChokeFilterTest); }; TEST_F(BweTestFramework_ChokeFilterTest, NoQueue) { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h index 23fce00d8c..4115d30c2a 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h @@ -248,7 +248,7 @@ class Logging { Context(const char* name, int64_t timestamp_ms, bool enabled); ~Context(); private: - DISALLOW_IMPLICIT_CONSTRUCTORS(Context); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Context); }; static Logging* GetInstance(); @@ -313,7 +313,7 @@ class Logging { rtc::scoped_ptr crit_sect_; ThreadMap thread_map_; - DISALLOW_COPY_AND_ASSIGN(Logging); + RTC_DISALLOW_COPY_AND_ASSIGN(Logging); }; } // namespace bwe } // namespace testing diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h index 36c3ecaf6f..eee90cf463 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h @@ -99,7 +99,7 @@ class NadaBweSender : public BweSender { int64_t min_round_trip_time_ms_ = 100; bool original_operating_mode_; - DISALLOW_IMPLICIT_CONSTRUCTORS(NadaBweSender); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(NadaBweSender); }; } // namespace bwe diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h index 93279e660e..7dfd7a8459 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h @@ -44,7 +44,7 @@ class RembBweSender : public BweSender { private: Clock* clock_; - DISALLOW_IMPLICIT_CONSTRUCTORS(RembBweSender); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RembBweSender); }; class RembReceiver : public BweReceiver, public RemoteBitrateObserver { @@ -73,7 +73,7 @@ class RembReceiver : public BweReceiver, public RemoteBitrateObserver { int64_t last_feedback_ms_; rtc::scoped_ptr estimator_; - DISALLOW_IMPLICIT_CONSTRUCTORS(RembReceiver); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RembReceiver); }; } // namespace bwe diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h index 322dced000..ab9abc5cbc 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h @@ -45,7 +45,7 @@ class FullBweSender : public BweSender, public RemoteBitrateObserver { bool has_received_ack_; uint16_t last_acked_seq_num_; - DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender); }; class SendSideBweReceiver : public BweReceiver { diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h index 390a1f0999..fb9e9fd7ab 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h +++ b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h @@ -63,7 +63,7 @@ class PacketReceiver : public PacketProcessor { std::string delay_prefix_; BandwidthEstimatorType bwe_type_; - DISALLOW_IMPLICIT_CONSTRUCTORS(PacketReceiver); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PacketReceiver); }; } // namespace bwe } // namespace testing diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h index a6acea0395..c42647e2d3 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h +++ b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.h @@ -96,7 +96,7 @@ class VideoSender : public PacketSender, public BitrateObserver { private: uint32_t previous_sending_bitrate_; - DISALLOW_COPY_AND_ASSIGN(VideoSender); + RTC_DISALLOW_COPY_AND_ASSIGN(VideoSender); }; class PacedVideoSender : public VideoSender, public PacedSender::Callback { @@ -129,7 +129,7 @@ class PacedVideoSender : public VideoSender, public PacedSender::Callback { Packets queue_; Packets pacer_queue_; - DISALLOW_IMPLICIT_CONSTRUCTORS(PacedVideoSender); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PacedVideoSender); }; class TcpSender : public PacketSender { diff --git a/webrtc/modules/remote_bitrate_estimator/test/random.h b/webrtc/modules/remote_bitrate_estimator/test/random.h index 9713e43711..31c1ec142e 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/random.h +++ b/webrtc/modules/remote_bitrate_estimator/test/random.h @@ -33,7 +33,7 @@ class Random { uint32_t a_; uint32_t b_; - DISALLOW_IMPLICIT_CONSTRUCTORS(Random); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Random); }; } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h b/webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h index 63949f7619..b1bc09a9a3 100644 --- a/webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h +++ b/webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h @@ -43,7 +43,7 @@ class RemoteNtpTimeEstimator { rtc::scoped_ptr ts_extrapolator_; RtcpList rtcp_list_; int64_t last_timing_log_ms_; - DISALLOW_COPY_AND_ASSIGN(RemoteNtpTimeEstimator); + RTC_DISALLOW_COPY_AND_ASSIGN(RemoteNtpTimeEstimator); }; } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h index cfbe8cee92..f29540100b 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h @@ -140,7 +140,7 @@ class Empty : public RtcpPacket { size_t BlockLength() const override; private: - DISALLOW_COPY_AND_ASSIGN(Empty); + RTC_DISALLOW_COPY_AND_ASSIGN(Empty); }; // From RFC 3550, RTP: A Transport Protocol for Real-Time Applications. @@ -268,7 +268,7 @@ class SenderReport : public RtcpPacket { RTCPUtility::RTCPPacketSR sr_; std::vector report_blocks_; - DISALLOW_COPY_AND_ASSIGN(SenderReport); + RTC_DISALLOW_COPY_AND_ASSIGN(SenderReport); }; // @@ -314,7 +314,7 @@ class ReceiverReport : public RtcpPacket { RTCPUtility::RTCPPacketRR rr_; std::vector report_blocks_; - DISALLOW_COPY_AND_ASSIGN(ReceiverReport); + RTC_DISALLOW_COPY_AND_ASSIGN(ReceiverReport); }; // Transmission Time Offsets in RTP Streams (RFC 5450). @@ -359,7 +359,7 @@ class Ij : public RtcpPacket { std::vector ij_items_; - DISALLOW_COPY_AND_ASSIGN(Ij); + RTC_DISALLOW_COPY_AND_ASSIGN(Ij); }; // Source Description (SDES) (RFC 3550). @@ -415,7 +415,7 @@ class Sdes : public RtcpPacket { std::vector chunks_; - DISALLOW_COPY_AND_ASSIGN(Sdes); + RTC_DISALLOW_COPY_AND_ASSIGN(Sdes); }; // @@ -465,7 +465,7 @@ class Bye : public RtcpPacket { RTCPUtility::RTCPPacketBYE bye_; std::vector csrcs_; - DISALLOW_COPY_AND_ASSIGN(Bye); + RTC_DISALLOW_COPY_AND_ASSIGN(Bye); }; // Application-Defined packet (APP) (RFC 3550). @@ -524,7 +524,7 @@ class App : public RtcpPacket { uint32_t ssrc_; RTCPUtility::RTCPPacketAPP app_; - DISALLOW_COPY_AND_ASSIGN(App); + RTC_DISALLOW_COPY_AND_ASSIGN(App); }; // RFC 4585: Feedback format. @@ -575,7 +575,7 @@ class Pli : public RtcpPacket { RTCPUtility::RTCPPacketPSFBPLI pli_; - DISALLOW_COPY_AND_ASSIGN(Pli); + RTC_DISALLOW_COPY_AND_ASSIGN(Pli); }; // Slice loss indication (SLI) (RFC 4585). @@ -630,7 +630,7 @@ class Sli : public RtcpPacket { RTCPUtility::RTCPPacketPSFBSLI sli_; RTCPUtility::RTCPPacketPSFBSLIItem sli_item_; - DISALLOW_COPY_AND_ASSIGN(Sli); + RTC_DISALLOW_COPY_AND_ASSIGN(Sli); }; // Generic NACK (RFC 4585). @@ -671,7 +671,7 @@ class Nack : public RtcpPacket { RTCPUtility::RTCPPacketRTPFBNACK nack_; std::vector nack_fields_; - DISALLOW_COPY_AND_ASSIGN(Nack); + RTC_DISALLOW_COPY_AND_ASSIGN(Nack); }; // Reference picture selection indication (RPSI) (RFC 4585). @@ -723,7 +723,7 @@ class Rpsi : public RtcpPacket { uint8_t padding_bytes_; RTCPUtility::RTCPPacketPSFBRPSI rpsi_; - DISALLOW_COPY_AND_ASSIGN(Rpsi); + RTC_DISALLOW_COPY_AND_ASSIGN(Rpsi); }; // Full intra request (FIR) (RFC 5104). @@ -823,7 +823,7 @@ class Tmmbr : public RtcpPacket { RTCPUtility::RTCPPacketRTPFBTMMBR tmmbr_; RTCPUtility::RTCPPacketRTPFBTMMBRItem tmmbr_item_; - DISALLOW_COPY_AND_ASSIGN(Tmmbr); + RTC_DISALLOW_COPY_AND_ASSIGN(Tmmbr); }; // Temporary Maximum Media Stream Bit Rate Notification (TMMBN) (RFC 5104). @@ -869,7 +869,7 @@ class Tmmbn : public RtcpPacket { RTCPUtility::RTCPPacketRTPFBTMMBN tmmbn_; std::vector tmmbn_items_; - DISALLOW_COPY_AND_ASSIGN(Tmmbn); + RTC_DISALLOW_COPY_AND_ASSIGN(Tmmbn); }; // Receiver Estimated Max Bitrate (REMB) (draft-alvestrand-rmcat-remb). @@ -925,7 +925,7 @@ class Remb : public RtcpPacket { RTCPUtility::RTCPPacketPSFBAPP remb_; RTCPUtility::RTCPPacketPSFBREMBItem remb_item_; - DISALLOW_COPY_AND_ASSIGN(Remb); + RTC_DISALLOW_COPY_AND_ASSIGN(Remb); }; // From RFC 3611: RTP Control Protocol Extended Reports (RTCP XR). @@ -993,7 +993,7 @@ class Xr : public RtcpPacket { std::vector dlrr_blocks_; std::vector voip_metric_blocks_; - DISALLOW_COPY_AND_ASSIGN(Xr); + RTC_DISALLOW_COPY_AND_ASSIGN(Xr); }; // Receiver Reference Time Report Block (RFC 3611). @@ -1026,7 +1026,7 @@ class Rrtr { friend class Xr; RTCPUtility::RTCPPacketXRReceiverReferenceTimeItem rrtr_block_; - DISALLOW_COPY_AND_ASSIGN(Rrtr); + RTC_DISALLOW_COPY_AND_ASSIGN(Rrtr); }; // DLRR Report Block (RFC 3611). @@ -1060,7 +1060,7 @@ class Dlrr { std::vector dlrr_block_; - DISALLOW_COPY_AND_ASSIGN(Dlrr); + RTC_DISALLOW_COPY_AND_ASSIGN(Dlrr); }; // VoIP Metrics Report Block (RFC 3611). @@ -1130,7 +1130,7 @@ class VoipMetric { friend class Xr; RTCPUtility::RTCPPacketXRVOIPMetricItem metric_; - DISALLOW_COPY_AND_ASSIGN(VoipMetric); + RTC_DISALLOW_COPY_AND_ASSIGN(VoipMetric); }; // Class holding a RTCP packet. diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h index 1bca184612..4cc1f38479 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h @@ -97,7 +97,7 @@ class TransportFeedback : public RtcpPacket { bool vec_needs_two_bit_symbols_; uint32_t size_bytes_; - DISALLOW_COPY_AND_ASSIGN(TransportFeedback); + RTC_DISALLOW_COPY_AND_ASSIGN(TransportFeedback); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h index a7f3c9fa64..790fe819ef 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h @@ -85,7 +85,7 @@ public: RTCPVoIPMetric* VoIPMetric; private: - DISALLOW_COPY_AND_ASSIGN(RTCPPacketInformation); + RTC_DISALLOW_COPY_AND_ASSIGN(RTCPPacketInformation); }; class RTCPReceiveInformation diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h index 4e92895c61..d5ad5fd186 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h @@ -86,7 +86,7 @@ class RtpPacketizerH264 : public RtpPacketizer { PacketQueue packets_; FrameType frame_type_; - DISALLOW_COPY_AND_ASSIGN(RtpPacketizerH264); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpPacketizerH264); }; // Depacketizer for H264. diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h index 2e7bca5c48..3bf72e9dd3 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h @@ -59,7 +59,7 @@ class RtpPacketizerGeneric : public RtpPacketizer { size_t payload_length_; uint8_t generic_header_; - DISALLOW_COPY_AND_ASSIGN(RtpPacketizerGeneric); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpPacketizerGeneric); }; // Depacketizer for generic codec. diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h index d73dfc1b50..63db349c74 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h @@ -212,7 +212,7 @@ class RtpPacketizerVp8 : public RtpPacketizer { InfoQueue packets_; bool packets_calculated_; - DISALLOW_COPY_AND_ASSIGN(RtpPacketizerVp8); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpPacketizerVp8); }; // Depacketizer for VP8. diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h index 2454fb70cc..2fe963251f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h @@ -65,7 +65,7 @@ class RtpFormatVp8TestHelper { bool sloppy_partitioning_; bool inited_; - DISALLOW_COPY_AND_ASSIGN(RtpFormatVp8TestHelper); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpFormatVp8TestHelper); }; } // namespace test diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h index 883fbce5c8..abce7e7791 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h @@ -91,7 +91,7 @@ class RtpPacketizerVp9 : public RtpPacketizer { size_t payload_size_; // The size in bytes of the payload data. PacketInfoQueue packets_; - DISALLOW_COPY_AND_ASSIGN(RtpPacketizerVp9); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpPacketizerVp9); }; diff --git a/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h b/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h index 67babcb330..53b678f3b9 100644 --- a/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h +++ b/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h @@ -78,7 +78,7 @@ class PartitionTreeNode { int min_parent_size_; bool packet_start_; - DISALLOW_COPY_AND_ASSIGN(PartitionTreeNode); + RTC_DISALLOW_COPY_AND_ASSIGN(PartitionTreeNode); }; // Class that calculates the optimal aggregation of VP8 partitions smaller than @@ -130,7 +130,7 @@ class Vp8PartitionAggregator { size_t* size_vector_; size_t largest_partition_size_; - DISALLOW_COPY_AND_ASSIGN(Vp8PartitionAggregator); + RTC_DISALLOW_COPY_AND_ASSIGN(Vp8PartitionAggregator); }; } // namespace diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.h b/webrtc/modules/video_coding/main/source/jitter_buffer.h index 3961dff46f..8a05f1ff17 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.h +++ b/webrtc/modules/video_coding/main/source/jitter_buffer.h @@ -360,7 +360,7 @@ class VCMJitterBuffer { // average_packets_per_frame converges fast if we have fewer than this many // frames. int frame_counter_; - DISALLOW_COPY_AND_ASSIGN(VCMJitterBuffer); + RTC_DISALLOW_COPY_AND_ASSIGN(VCMJitterBuffer); }; } // namespace webrtc diff --git a/webrtc/modules/video_coding/main/source/test/stream_generator.h b/webrtc/modules/video_coding/main/source/test/stream_generator.h index e3a2e79cd3..7902d16706 100644 --- a/webrtc/modules/video_coding/main/source/test/stream_generator.h +++ b/webrtc/modules/video_coding/main/source/test/stream_generator.h @@ -64,7 +64,7 @@ class StreamGenerator { int64_t start_time_; uint8_t packet_buffer_[kMaxPacketSize]; - DISALLOW_COPY_AND_ASSIGN(StreamGenerator); + RTC_DISALLOW_COPY_AND_ASSIGN(StreamGenerator); }; } // namespace webrtc diff --git a/webrtc/modules/video_coding/main/test/rtp_player.cc b/webrtc/modules/video_coding/main/test/rtp_player.cc index c7a2f660d7..e53a4ab9c8 100644 --- a/webrtc/modules/video_coding/main/test/rtp_player.cc +++ b/webrtc/modules/video_coding/main/test/rtp_player.cc @@ -66,7 +66,7 @@ class RawRtpPacket { uint32_t ssrc_; uint16_t seq_num_; - DISALLOW_IMPLICIT_CONSTRUCTORS(RawRtpPacket); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RawRtpPacket); }; class LostPackets { @@ -182,7 +182,7 @@ class LostPackets { Clock* clock_; int64_t rtt_ms_; - DISALLOW_IMPLICIT_CONSTRUCTORS(LostPackets); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LostPackets); }; class SsrcHandlers { @@ -305,7 +305,7 @@ class SsrcHandlers { const PayloadTypes& payload_types_; LostPackets* lost_packets_; - DISALLOW_COPY_AND_ASSIGN(Handler); + RTC_DISALLOW_COPY_AND_ASSIGN(Handler); }; typedef std::map HandlerMap; @@ -315,7 +315,7 @@ class SsrcHandlers { PayloadTypes payload_types_; HandlerMap handlers_; - DISALLOW_IMPLICIT_CONSTRUCTORS(SsrcHandlers); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SsrcHandlers); }; class RtpPlayerImpl : public RtpPlayerInterface { @@ -467,7 +467,7 @@ class RtpPlayerImpl : public RtpPlayerInterface { bool reordering_; rtc::scoped_ptr reorder_buffer_; - DISALLOW_IMPLICIT_CONSTRUCTORS(RtpPlayerImpl); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpPlayerImpl); }; RtpPlayerInterface* Create(const std::string& input_filename, diff --git a/webrtc/modules/video_coding/main/test/test_util.h b/webrtc/modules/video_coding/main/test/test_util.h index 11fb6d4dda..47e055ced4 100644 --- a/webrtc/modules/video_coding/main/test/test_util.h +++ b/webrtc/modules/video_coding/main/test/test_util.h @@ -68,7 +68,7 @@ class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback { int height_; int count_; - DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver); }; class CmdArgs { diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc index 2fe646ed74..6a6362b9d3 100644 --- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc +++ b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc @@ -95,7 +95,7 @@ class VcmPayloadSinkFactory::VcmPayloadSink rtc::scoped_ptr vcm_; rtc::scoped_ptr frame_receiver_; - DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSink); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSink); }; VcmPayloadSinkFactory::VcmPayloadSinkFactory( diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h index ca0ed56054..ec94bdc382 100644 --- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h +++ b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h @@ -57,7 +57,7 @@ class VcmPayloadSinkFactory : public PayloadSinkFactoryInterface { rtc::scoped_ptr crit_sect_; Sinks sinks_; - DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSinkFactory); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSinkFactory); }; } // namespace rtpplayer } // namespace webrtc diff --git a/webrtc/overrides/webrtc/base/constructormagic.h b/webrtc/overrides/webrtc/base/constructormagic.h index f71fe82024..ed96339d1c 100644 --- a/webrtc/overrides/webrtc/base/constructormagic.h +++ b/webrtc/overrides/webrtc/base/constructormagic.h @@ -9,7 +9,7 @@ */ // This file overrides the inclusion of webrtc/base/constructormagic.h -// We do this because constructor magic defines DISALLOW_COPY_AND_ASSIGN, +// We do this because constructor magic defines RTC_DISALLOW_COPY_AND_ASSIGN, // but we want to use the version from Chromium. #ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__ diff --git a/webrtc/p2p/base/asyncstuntcpsocket.h b/webrtc/p2p/base/asyncstuntcpsocket.h index 734ab92dcd..3a15d4a399 100644 --- a/webrtc/p2p/base/asyncstuntcpsocket.h +++ b/webrtc/p2p/base/asyncstuntcpsocket.h @@ -42,7 +42,7 @@ class AsyncStunTCPSocket : public rtc::AsyncTCPSocketBase { size_t GetExpectedLength(const void* data, size_t len, int* pad_bytes); - DISALLOW_COPY_AND_ASSIGN(AsyncStunTCPSocket); + RTC_DISALLOW_COPY_AND_ASSIGN(AsyncStunTCPSocket); }; } // namespace cricket diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h index 0daf51b90e..681e7b4793 100644 --- a/webrtc/p2p/base/dtlstransportchannel.h +++ b/webrtc/p2p/base/dtlstransportchannel.h @@ -45,7 +45,7 @@ class StreamInterfaceChannel : public rtc::StreamInterface { rtc::StreamState state_; rtc::BufferQueue packets_; - DISALLOW_COPY_AND_ASSIGN(StreamInterfaceChannel); + RTC_DISALLOW_COPY_AND_ASSIGN(StreamInterfaceChannel); }; @@ -243,7 +243,7 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl { rtc::Buffer remote_fingerprint_value_; std::string remote_fingerprint_algorithm_; - DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper); + RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper); }; } // namespace cricket diff --git a/webrtc/p2p/base/p2ptransport.h b/webrtc/p2p/base/p2ptransport.h index 34cc8491a9..2e27bd8a3b 100644 --- a/webrtc/p2p/base/p2ptransport.h +++ b/webrtc/p2p/base/p2ptransport.h @@ -31,7 +31,7 @@ class P2PTransport : public Transport { friend class P2PTransportChannel; - DISALLOW_COPY_AND_ASSIGN(P2PTransport); + RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransport); }; } // namespace cricket diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h index e1dd3fe297..139e6135eb 100644 --- a/webrtc/p2p/base/p2ptransportchannel.h +++ b/webrtc/p2p/base/p2ptransportchannel.h @@ -254,7 +254,7 @@ class P2PTransportChannel : public TransportChannelImpl, int check_receiving_delay_; int receiving_timeout_; - DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel); + RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel); }; } // namespace cricket diff --git a/webrtc/p2p/base/packetsocketfactory.h b/webrtc/p2p/base/packetsocketfactory.h index 23acb3050c..e51c7873b6 100644 --- a/webrtc/p2p/base/packetsocketfactory.h +++ b/webrtc/p2p/base/packetsocketfactory.h @@ -50,7 +50,7 @@ class PacketSocketFactory { virtual AsyncResolverInterface* CreateAsyncResolver() = 0; private: - DISALLOW_COPY_AND_ASSIGN(PacketSocketFactory); + RTC_DISALLOW_COPY_AND_ASSIGN(PacketSocketFactory); }; } // namespace rtc diff --git a/webrtc/p2p/base/transport.h b/webrtc/p2p/base/transport.h index ced0d2ea14..7b78a8d9ec 100644 --- a/webrtc/p2p/base/transport.h +++ b/webrtc/p2p/base/transport.h @@ -476,7 +476,7 @@ class Transport : public rtc::MessageHandler, // Protects changes to channels and messages rtc::CriticalSection crit_; - DISALLOW_COPY_AND_ASSIGN(Transport); + RTC_DISALLOW_COPY_AND_ASSIGN(Transport); }; // Extract a TransportProtocol from a TransportDescription. diff --git a/webrtc/p2p/base/transportchannel.h b/webrtc/p2p/base/transportchannel.h index e0dcc3719f..f492e4e000 100644 --- a/webrtc/p2p/base/transportchannel.h +++ b/webrtc/p2p/base/transportchannel.h @@ -157,7 +157,7 @@ class TransportChannel : public sigslot::has_slots<> { bool writable_; bool receiving_; - DISALLOW_COPY_AND_ASSIGN(TransportChannel); + RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannel); }; } // namespace cricket diff --git a/webrtc/p2p/base/transportchannelimpl.h b/webrtc/p2p/base/transportchannelimpl.h index 7166ea076c..48851b8367 100644 --- a/webrtc/p2p/base/transportchannelimpl.h +++ b/webrtc/p2p/base/transportchannelimpl.h @@ -98,7 +98,7 @@ class TransportChannelImpl : public TransportChannel { sigslot::signal1 SignalConnectionRemoved; private: - DISALLOW_COPY_AND_ASSIGN(TransportChannelImpl); + RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannelImpl); }; } // namespace cricket diff --git a/webrtc/p2p/base/transportchannelproxy.h b/webrtc/p2p/base/transportchannelproxy.h index e39398abe8..f10f5076eb 100644 --- a/webrtc/p2p/base/transportchannelproxy.h +++ b/webrtc/p2p/base/transportchannelproxy.h @@ -88,7 +88,7 @@ class TransportChannelProxy : public TransportChannel, OptionList options_; std::vector pending_srtp_ciphers_; - DISALLOW_COPY_AND_ASSIGN(TransportChannelProxy); + RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannelProxy); }; } // namespace cricket diff --git a/webrtc/p2p/stunprober/stunprober.cc b/webrtc/p2p/stunprober/stunprober.cc index 49f231b184..c1342ddda8 100644 --- a/webrtc/p2p/stunprober/stunprober.cc +++ b/webrtc/p2p/stunprober/stunprober.cc @@ -102,7 +102,7 @@ class StunProber::Requester : public sigslot::has_slots<> { rtc::ThreadChecker& thread_checker_; - DISALLOW_COPY_AND_ASSIGN(Requester); + RTC_DISALLOW_COPY_AND_ASSIGN(Requester); }; StunProber::Requester::Requester( diff --git a/webrtc/p2p/stunprober/stunprober.h b/webrtc/p2p/stunprober/stunprober.h index 56d5369d82..88dedd50d8 100644 --- a/webrtc/p2p/stunprober/stunprober.h +++ b/webrtc/p2p/stunprober/stunprober.h @@ -190,7 +190,7 @@ class StunProber : public sigslot::has_slots<> { rtc::NetworkManager::NetworkList networks_; - DISALLOW_COPY_AND_ASSIGN(StunProber); + RTC_DISALLOW_COPY_AND_ASSIGN(StunProber); }; } // namespace stunprober diff --git a/webrtc/sound/alsasoundsystem.cc b/webrtc/sound/alsasoundsystem.cc index 867af440a0..d96db0b046 100644 --- a/webrtc/sound/alsasoundsystem.cc +++ b/webrtc/sound/alsasoundsystem.cc @@ -223,7 +223,7 @@ class AlsaStream { int flags_; int freq_; - DISALLOW_COPY_AND_ASSIGN(AlsaStream); + RTC_DISALLOW_COPY_AND_ASSIGN(AlsaStream); }; // Implementation of an input stream. See soundinputstreaminterface.h regarding @@ -329,7 +329,7 @@ class AlsaInputStream : rtc::scoped_ptr buffer_; size_t buffer_size_; - DISALLOW_COPY_AND_ASSIGN(AlsaInputStream); + RTC_DISALLOW_COPY_AND_ASSIGN(AlsaInputStream); }; // Implementation of an output stream. See soundoutputstreaminterface.h @@ -434,7 +434,7 @@ class AlsaOutputStream : AlsaStream stream_; - DISALLOW_COPY_AND_ASSIGN(AlsaOutputStream); + RTC_DISALLOW_COPY_AND_ASSIGN(AlsaOutputStream); }; AlsaSoundSystem::AlsaSoundSystem() : initialized_(false) {} diff --git a/webrtc/sound/alsasoundsystem.h b/webrtc/sound/alsasoundsystem.h index f95e68618d..b0cc1a4029 100644 --- a/webrtc/sound/alsasoundsystem.h +++ b/webrtc/sound/alsasoundsystem.h @@ -95,7 +95,7 @@ class AlsaSoundSystem : public SoundSystemInterface { bool initialized_; AlsaSymbolTable symbol_table_; - DISALLOW_COPY_AND_ASSIGN(AlsaSoundSystem); + RTC_DISALLOW_COPY_AND_ASSIGN(AlsaSoundSystem); }; } // namespace rtc diff --git a/webrtc/sound/pulseaudiosoundsystem.cc b/webrtc/sound/pulseaudiosoundsystem.cc index abc6d500cb..b44a1dfad7 100644 --- a/webrtc/sound/pulseaudiosoundsystem.cc +++ b/webrtc/sound/pulseaudiosoundsystem.cc @@ -206,7 +206,7 @@ class PulseAudioStream { pa_stream *stream_; int flags_; - DISALLOW_COPY_AND_ASSIGN(PulseAudioStream); + RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioStream); }; // Implementation of an input stream. See soundinputstreaminterface.h regarding @@ -570,7 +570,7 @@ class PulseAudioInputStream : const void *temp_sample_data_; size_t temp_sample_data_size_; - DISALLOW_COPY_AND_ASSIGN(PulseAudioInputStream); + RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioInputStream); }; // Implementation of an output stream. See soundoutputstreaminterface.h @@ -954,7 +954,7 @@ class PulseAudioOutputStream : // Temporary storage for passing data between threads. size_t temp_buffer_space_; - DISALLOW_COPY_AND_ASSIGN(PulseAudioOutputStream); + RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioOutputStream); }; PulseAudioSoundSystem::PulseAudioSoundSystem() diff --git a/webrtc/sound/pulseaudiosoundsystem.h b/webrtc/sound/pulseaudiosoundsystem.h index 4e67acc0ac..895b784552 100644 --- a/webrtc/sound/pulseaudiosoundsystem.h +++ b/webrtc/sound/pulseaudiosoundsystem.h @@ -167,7 +167,7 @@ class PulseAudioSoundSystem : public SoundSystemInterface { pa_context *context_; PulseAudioSymbolTable symbol_table_; - DISALLOW_COPY_AND_ASSIGN(PulseAudioSoundSystem); + RTC_DISALLOW_COPY_AND_ASSIGN(PulseAudioSoundSystem); }; } // namespace rtc diff --git a/webrtc/sound/sounddevicelocator.h b/webrtc/sound/sounddevicelocator.h index 4e8e1485ab..f8a6cf8802 100644 --- a/webrtc/sound/sounddevicelocator.h +++ b/webrtc/sound/sounddevicelocator.h @@ -46,7 +46,7 @@ class SoundDeviceLocator { std::string device_name_; private: - DISALLOW_ASSIGN(SoundDeviceLocator); + RTC_DISALLOW_ASSIGN(SoundDeviceLocator); }; } // namespace rtc diff --git a/webrtc/sound/soundinputstreaminterface.h b/webrtc/sound/soundinputstreaminterface.h index 6ce9446d8d..424ce8e927 100644 --- a/webrtc/sound/soundinputstreaminterface.h +++ b/webrtc/sound/soundinputstreaminterface.h @@ -60,7 +60,7 @@ class SoundInputStreamInterface { SoundInputStreamInterface() {} private: - DISALLOW_COPY_AND_ASSIGN(SoundInputStreamInterface); + RTC_DISALLOW_COPY_AND_ASSIGN(SoundInputStreamInterface); }; } // namespace rtc diff --git a/webrtc/sound/soundoutputstreaminterface.h b/webrtc/sound/soundoutputstreaminterface.h index 2b501d658e..f56d39b7c9 100644 --- a/webrtc/sound/soundoutputstreaminterface.h +++ b/webrtc/sound/soundoutputstreaminterface.h @@ -64,7 +64,7 @@ class SoundOutputStreamInterface { SoundOutputStreamInterface() {} private: - DISALLOW_COPY_AND_ASSIGN(SoundOutputStreamInterface); + RTC_DISALLOW_COPY_AND_ASSIGN(SoundOutputStreamInterface); }; } // namespace rtc diff --git a/webrtc/sound/soundsysteminterface.h b/webrtc/sound/soundsysteminterface.h index aa9a53a93c..c386b07a4e 100644 --- a/webrtc/sound/soundsysteminterface.h +++ b/webrtc/sound/soundsysteminterface.h @@ -66,7 +66,7 @@ class SoundSystemInterface { // a slightly higher one in the event that the true minimum requires an // undesirable trade-off. static const int kLowLatency = 0; - + // Max value for the volume parameters for Sound(Input|Output)StreamInterface. static const int kMaxVolume = 255; // Min value for the volume parameters for Sound(Input|Output)StreamInterface. @@ -104,7 +104,7 @@ class SoundSystemInterface { SoundSystemInterface() {} private: - DISALLOW_COPY_AND_ASSIGN(SoundSystemInterface); + RTC_DISALLOW_COPY_AND_ASSIGN(SoundSystemInterface); }; } // namespace rtc diff --git a/webrtc/system_wrappers/interface/atomic32.h b/webrtc/system_wrappers/interface/atomic32.h index 8633e26362..36ca144bda 100644 --- a/webrtc/system_wrappers/interface/atomic32.h +++ b/webrtc/system_wrappers/interface/atomic32.h @@ -56,7 +56,7 @@ class Atomic32 { return (reinterpret_cast(&value_) & 3) == 0; } - DISALLOW_COPY_AND_ASSIGN(Atomic32); + RTC_DISALLOW_COPY_AND_ASSIGN(Atomic32); int32_t value_; }; diff --git a/webrtc/system_wrappers/source/scoped_vector_unittest.cc b/webrtc/system_wrappers/source/scoped_vector_unittest.cc index 9d7c811229..43df26a42b 100644 --- a/webrtc/system_wrappers/source/scoped_vector_unittest.cc +++ b/webrtc/system_wrappers/source/scoped_vector_unittest.cc @@ -44,7 +44,7 @@ class LifeCycleObject { Observer* observer_; - DISALLOW_COPY_AND_ASSIGN(LifeCycleObject); + RTC_DISALLOW_COPY_AND_ASSIGN(LifeCycleObject); }; // The life cycle states we care about for the purposes of testing ScopedVector @@ -107,7 +107,7 @@ class LifeCycleWatcher : public LifeCycleObject::Observer { LifeCycleState life_cycle_state_; rtc::scoped_ptr constructed_life_cycle_object_; - DISALLOW_COPY_AND_ASSIGN(LifeCycleWatcher); + RTC_DISALLOW_COPY_AND_ASSIGN(LifeCycleWatcher); }; TEST(ScopedVectorTest, LifeCycleWatcher) { @@ -266,7 +266,7 @@ class DeleteCounter { private: int* const deletes_; - DISALLOW_COPY_AND_ASSIGN(DeleteCounter); + RTC_DISALLOW_COPY_AND_ASSIGN(DeleteCounter); }; // This class is used in place of Chromium's base::Callback. diff --git a/webrtc/test/fake_network_pipe.h b/webrtc/test/fake_network_pipe.h index 3d8f47687b..0d19e765e2 100644 --- a/webrtc/test/fake_network_pipe.h +++ b/webrtc/test/fake_network_pipe.h @@ -91,7 +91,7 @@ class FakeNetworkPipe { int64_t next_process_time_; - DISALLOW_COPY_AND_ASSIGN(FakeNetworkPipe); + RTC_DISALLOW_COPY_AND_ASSIGN(FakeNetworkPipe); }; } // namespace webrtc diff --git a/webrtc/test/mac/video_renderer_mac.h b/webrtc/test/mac/video_renderer_mac.h index 5861e8c187..2e55538954 100644 --- a/webrtc/test/mac/video_renderer_mac.h +++ b/webrtc/test/mac/video_renderer_mac.h @@ -33,7 +33,7 @@ class MacRenderer : public GlRenderer { private: CocoaWindow* window_; - DISALLOW_COPY_AND_ASSIGN(MacRenderer); + RTC_DISALLOW_COPY_AND_ASSIGN(MacRenderer); }; } // test } // webrtc diff --git a/webrtc/test/rtp_file_reader.cc b/webrtc/test/rtp_file_reader.cc index c1a0bc81a2..cb0e40705f 100644 --- a/webrtc/test/rtp_file_reader.cc +++ b/webrtc/test/rtp_file_reader.cc @@ -203,7 +203,7 @@ class RtpDumpReader : public RtpFileReaderImpl { private: FILE* file_; - DISALLOW_COPY_AND_ASSIGN(RtpDumpReader); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpDumpReader); }; enum { @@ -640,7 +640,7 @@ class PcapReader : public RtpFileReaderImpl { std::vector packets_; PacketIterator next_packet_it_; - DISALLOW_COPY_AND_ASSIGN(PcapReader); + RTC_DISALLOW_COPY_AND_ASSIGN(PcapReader); }; RtpFileReader* RtpFileReader::Create(FileFormat format, diff --git a/webrtc/test/rtp_file_writer.cc b/webrtc/test/rtp_file_writer.cc index 4acaa27815..90c46beb48 100644 --- a/webrtc/test/rtp_file_writer.cc +++ b/webrtc/test/rtp_file_writer.cc @@ -87,7 +87,7 @@ class RtpDumpWriter : public RtpFileWriter { FILE* file_; - DISALLOW_COPY_AND_ASSIGN(RtpDumpWriter); + RTC_DISALLOW_COPY_AND_ASSIGN(RtpDumpWriter); }; RtpFileWriter* RtpFileWriter::Create(FileFormat format, diff --git a/webrtc/test/test_suite.h b/webrtc/test/test_suite.h index c166f283a5..dab2acd388 100644 --- a/webrtc/test/test_suite.h +++ b/webrtc/test/test_suite.h @@ -38,7 +38,7 @@ class TestSuite { virtual void Initialize(); virtual void Shutdown(); - DISALLOW_COPY_AND_ASSIGN(TestSuite); + RTC_DISALLOW_COPY_AND_ASSIGN(TestSuite); private: rtc::scoped_ptr trace_to_stderr_; diff --git a/webrtc/tools/simple_command_line_parser.h b/webrtc/tools/simple_command_line_parser.h index 6bb33137f5..c7bed5cd3a 100644 --- a/webrtc/tools/simple_command_line_parser.h +++ b/webrtc/tools/simple_command_line_parser.h @@ -91,7 +91,7 @@ class CommandLineParser { FRIEND_TEST_ALL_PREFIXES(CommandLineParserTest, GetCommandLineFlagName); FRIEND_TEST_ALL_PREFIXES(CommandLineParserTest, GetCommandLineFlagValue); - DISALLOW_COPY_AND_ASSIGN(CommandLineParser); + RTC_DISALLOW_COPY_AND_ASSIGN(CommandLineParser); }; } // namespace test diff --git a/webrtc/video/call.cc b/webrtc/video/call.cc index ccd2a6a796..3ef113c16b 100644 --- a/webrtc/video/call.cc +++ b/webrtc/video/call.cc @@ -124,7 +124,7 @@ class Call : public webrtc::Call, public PacketReceiver { RtcEventLog* event_log_; - DISALLOW_COPY_AND_ASSIGN(Call); + RTC_DISALLOW_COPY_AND_ASSIGN(Call); }; } // namespace internal diff --git a/webrtc/video_engine/call_stats.cc b/webrtc/video_engine/call_stats.cc index 92855e379f..c5e890d8a7 100644 --- a/webrtc/video_engine/call_stats.cc +++ b/webrtc/video_engine/call_stats.cc @@ -86,7 +86,7 @@ class RtcpObserver : public RtcpRttStats { private: CallStats* owner_; - DISALLOW_COPY_AND_ASSIGN(RtcpObserver); + RTC_DISALLOW_COPY_AND_ASSIGN(RtcpObserver); }; CallStats::CallStats() diff --git a/webrtc/video_engine/call_stats.h b/webrtc/video_engine/call_stats.h index 79a8af6267..a17330a7c1 100644 --- a/webrtc/video_engine/call_stats.h +++ b/webrtc/video_engine/call_stats.h @@ -73,7 +73,7 @@ class CallStats : public Module { // Observers getting stats reports. std::list observers_; - DISALLOW_COPY_AND_ASSIGN(CallStats); + RTC_DISALLOW_COPY_AND_ASSIGN(CallStats); }; } // namespace webrtc diff --git a/webrtc/video_engine/encoder_state_feedback.h b/webrtc/video_engine/encoder_state_feedback.h index 40fbf94377..51e9111dfe 100644 --- a/webrtc/video_engine/encoder_state_feedback.h +++ b/webrtc/video_engine/encoder_state_feedback.h @@ -63,7 +63,7 @@ class EncoderStateFeedback { // Maps a unique ssrc to the given encoder. SsrcEncoderMap encoders_; - DISALLOW_COPY_AND_ASSIGN(EncoderStateFeedback); + RTC_DISALLOW_COPY_AND_ASSIGN(EncoderStateFeedback); }; } // namespace webrtc diff --git a/webrtc/video_engine/overuse_frame_detector.h b/webrtc/video_engine/overuse_frame_detector.h index 323c057876..391c5cd327 100644 --- a/webrtc/video_engine/overuse_frame_detector.h +++ b/webrtc/video_engine/overuse_frame_detector.h @@ -178,7 +178,7 @@ class OveruseFrameDetector : public Module { rtc::ThreadChecker processing_thread_; - DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector); + RTC_DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector); }; } // namespace webrtc diff --git a/webrtc/video_engine/payload_router.h b/webrtc/video_engine/payload_router.h index b96defd5e3..0d6a1ac6dd 100644 --- a/webrtc/video_engine/payload_router.h +++ b/webrtc/video_engine/payload_router.h @@ -77,7 +77,7 @@ class PayloadRouter { Atomic32 ref_count_; - DISALLOW_COPY_AND_ASSIGN(PayloadRouter); + RTC_DISALLOW_COPY_AND_ASSIGN(PayloadRouter); }; } // namespace webrtc diff --git a/webrtc/video_engine/vie_channel.h b/webrtc/video_engine/vie_channel.h index 85f86d09fa..834c933980 100644 --- a/webrtc/video_engine/vie_channel.h +++ b/webrtc/video_engine/vie_channel.h @@ -349,7 +349,7 @@ class ViEChannel : public VCMFrameTypeCallback, T* callback_ GUARDED_BY(critsect_); private: - DISALLOW_COPY_AND_ASSIGN(RegisterableCallback); + RTC_DISALLOW_COPY_AND_ASSIGN(RegisterableCallback); }; class RegisterableBitrateStatisticsObserver: diff --git a/webrtc/video_engine/vie_channel_group.cc b/webrtc/video_engine/vie_channel_group.cc index fc7a2d1a52..60db171b06 100644 --- a/webrtc/video_engine/vie_channel_group.cc +++ b/webrtc/video_engine/vie_channel_group.cc @@ -136,7 +136,7 @@ class WrappingBitrateEstimator : public RemoteBitrateEstimator { bool using_absolute_send_time_; uint32_t packets_since_absolute_send_time_; - DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator); + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator); }; } // namespace diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h index 4aeb4225d0..d01fc68d0f 100644 --- a/webrtc/voice_engine/channel_manager.h +++ b/webrtc/voice_engine/channel_manager.h @@ -91,7 +91,7 @@ class ChannelManager { size_t iterator_pos_; std::vector channels_; - DISALLOW_COPY_AND_ASSIGN(Iterator); + RTC_DISALLOW_COPY_AND_ASSIGN(Iterator); }; // CreateChannel will always return a valid ChannelOwner instance. The channel @@ -129,7 +129,7 @@ class ChannelManager { const Config& config_; rtc::scoped_ptr event_log_; - DISALLOW_COPY_AND_ASSIGN(ChannelManager); + RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager); }; } // namespace voe } // namespace webrtc