Add RTC_ prefix to contructormagic macros.
We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition.
* DISALLOW_ASSIGN -> RTC_DISALLOW_ASSIGN
* DISALLOW_COPY_AND_ASSIGN -> RTC_DISALLOW_COPY_AND_ASSIGN
* DISALLOW_IMPLICIT_CONSTRUCTORS -> RTC_DISALLOW_IMPLICIT_CONSTRUCTORS
Related CL: https://codereview.webrtc.org/1335923002/
BUG=chromium:468375
NOTRY=true
Review URL: https://codereview.webrtc.org/1345433002
Cr-Commit-Position: refs/heads/master@{#9953}
diff --git a/talk/app/webrtc/dtmfsender.h b/talk/app/webrtc/dtmfsender.h
index ec9a36e..6d23610 100644
--- a/talk/app/webrtc/dtmfsender.h
+++ b/talk/app/webrtc/dtmfsender.h
@@ -116,7 +116,7 @@
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 625486f..c270439 100644
--- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
+++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
@@ -102,7 +102,7 @@
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 ad3b338..1d5ef19 100644
--- a/talk/app/webrtc/jsepicecandidate.h
+++ b/talk/app/webrtc/jsepicecandidate.h
@@ -63,7 +63,7 @@
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 53f4e06..756352c 100644
--- a/talk/app/webrtc/jsepsessiondescription.h
+++ b/talk/app/webrtc/jsepsessiondescription.h
@@ -98,7 +98,7 @@
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 d8c9b52..ff21314 100644
--- a/talk/app/webrtc/mediacontroller.cc
+++ b/talk/app/webrtc/mediacontroller.cc
@@ -74,7 +74,7 @@
rtc::Thread* worker_thread_;
rtc::scoped_ptr<webrtc::Call> 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 1bb4d07..1429ffb 100644
--- a/talk/app/webrtc/remotevideocapturer.h
+++ b/talk/app/webrtc/remotevideocapturer.h
@@ -57,7 +57,7 @@
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 156e784..5d5d717 100644
--- a/talk/app/webrtc/statstypes.h
+++ b/talk/app/webrtc/statstypes.h
@@ -321,7 +321,7 @@
} 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 @@
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 bb27b10..4c56f95 100644
--- a/talk/app/webrtc/videosource.cc
+++ b/talk/app/webrtc/videosource.cc
@@ -321,7 +321,7 @@
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 3c70b02..582d6d0 100644
--- a/talk/app/webrtc/webrtcsession.h
+++ b/talk/app/webrtc/webrtcsession.h
@@ -107,7 +107,7 @@
~IceObserver() {}
private:
- DISALLOW_COPY_AND_ASSIGN(IceObserver);
+ RTC_DISALLOW_COPY_AND_ASSIGN(IceObserver);
};
class WebRtcSession : public cricket::BaseSession,
@@ -414,7 +414,7 @@
// 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 8abf6aa..b42a551 100644
--- a/talk/app/webrtc/webrtcsessiondescriptionfactory.h
+++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.h
@@ -197,7 +197,7 @@
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 310b221..04d1b7b 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 @@
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 33c31c9..ce85db1 100644
--- a/talk/media/base/rtpdump.h
+++ b/talk/media/base/rtpdump.h
@@ -133,7 +133,7 @@
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 @@
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 @@
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 a452894..e5d0177 100644
--- a/talk/media/base/streamparams.h
+++ b/talk/media/base/streamparams.h
@@ -246,7 +246,7 @@
std::vector<StreamParams> video_;
std::vector<StreamParams> 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 58d2f03..4c863b3 100644
--- a/talk/media/base/videoadapter.h
+++ b/talk/media/base/videoadapter.h
@@ -92,7 +92,7 @@
// 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 @@
// 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 df9cf7f..95cb9e9 100644
--- a/talk/media/base/videocapturer.h
+++ b/talk/media/base/videocapturer.h
@@ -104,7 +104,7 @@
// 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 @@
// 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 b47be64..27ea2e8 100644
--- a/talk/media/base/yuvframegenerator.h
+++ b/talk/media/base/yuvframegenerator.h
@@ -97,7 +97,7 @@
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 96dbcb1..6025d6d 100644
--- a/talk/media/devices/filevideocapturer.cc
+++ b/talk/media/devices/filevideocapturer.cc
@@ -150,7 +150,7 @@
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 101b9b9..3ef82ef 100644
--- a/talk/media/devices/filevideocapturer.h
+++ b/talk/media/devices/filevideocapturer.h
@@ -71,7 +71,7 @@
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 @@
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 d9b0fc5..7579df1 100644
--- a/talk/media/devices/yuvframescapturer.cc
+++ b/talk/media/devices/yuvframescapturer.cc
@@ -88,7 +88,7 @@
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 b5d8655..08c8470 100644
--- a/talk/media/devices/yuvframescapturer.h
+++ b/talk/media/devices/yuvframescapturer.h
@@ -90,7 +90,7 @@
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 f171f5f..a536327 100644
--- a/talk/session/media/srtpfilter.h
+++ b/talk/session/media/srtpfilter.h
@@ -245,7 +245,7 @@
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 @@
// 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 d8174a9..4cbcb4a 100644
--- a/talk/session/media/srtpfilter_unittest.cc
+++ b/talk/session/media/srtpfilter_unittest.cc
@@ -797,7 +797,7 @@
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 e0264be..2d2c65c 100644
--- a/webrtc/base/asyncinvoker.h
+++ b/webrtc/base/asyncinvoker.h
@@ -141,7 +141,7 @@
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 0affd24..f0c221d 100644
--- a/webrtc/base/asyncpacketsocket.h
+++ b/webrtc/base/asyncpacketsocket.h
@@ -130,7 +130,7 @@
sigslot::signal2<AsyncPacketSocket*, AsyncPacketSocket*> 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 6435510..321fa23 100644
--- a/webrtc/base/asynctcpsocket.h
+++ b/webrtc/base/asynctcpsocket.h
@@ -74,7 +74,7 @@
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 @@
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 b9887bc..1bd523f 100644
--- a/webrtc/base/autodetectproxy.h
+++ b/webrtc/base/autodetectproxy.h
@@ -81,7 +81,7 @@
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 4f9ed3c..7202675 100644
--- a/webrtc/base/bitbuffer.h
+++ b/webrtc/base/bitbuffer.h
@@ -81,7 +81,7 @@
// 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 @@
// 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 4adae41..4941fcc 100644
--- a/webrtc/base/bufferqueue.h
+++ b/webrtc/base/bufferqueue.h
@@ -42,7 +42,7 @@
std::vector<Buffer*> 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 c4632f5..6cab2a8 100644
--- a/webrtc/base/bytebuffer.h
+++ b/webrtc/base/bytebuffer.h
@@ -114,7 +114,7 @@
// 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 6b1244f..c234d40 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 46a4f34..241d611 100644
--- a/webrtc/base/criticalsection.h
+++ b/webrtc/base/criticalsection.h
@@ -72,7 +72,7 @@
~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 @@
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 @@
~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 f3de14e..9e8e35d 100644
--- a/webrtc/base/filerotatingstream.h
+++ b/webrtc/base/filerotatingstream.h
@@ -123,7 +123,7 @@
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 @@
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 1533fb5..8d085ef 100644
--- a/webrtc/base/fileutils.h
+++ b/webrtc/base/fileutils.h
@@ -407,7 +407,7 @@
static FilesystemInterface* default_filesystem_;
static FilesystemInterface *EnsureDefaultFilesystem();
- DISALLOW_IMPLICIT_CONSTRUCTORS(Filesystem);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Filesystem);
};
class FilesystemScope{
@@ -420,7 +420,7 @@
}
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 e500534..4ce857b 100644
--- a/webrtc/base/flags.h
+++ b/webrtc/base/flags.h
@@ -90,17 +90,17 @@
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 @@
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 @@
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 c1f535c..636e7d0 100644
--- a/webrtc/base/latebindingsymboltable.h
+++ b/webrtc/base/latebindingsymboltable.h
@@ -61,7 +61,7 @@
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 39b515f..bc6396b 100644
--- a/webrtc/base/latebindingsymboltable.h.def
+++ b/webrtc/base/latebindingsymboltable.h.def
@@ -76,7 +76,7 @@
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 739bf63..b8f460c 100644
--- a/webrtc/base/logging.h
+++ b/webrtc/base/logging.h
@@ -239,7 +239,7 @@
// 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 849e1dc..eabf056 100644
--- a/webrtc/base/logsinks.h
+++ b/webrtc/base/logsinks.h
@@ -48,7 +48,7 @@
private:
scoped_ptr<FileRotatingStream> 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 @@
~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 a43177d..7351474 100644
--- a/webrtc/base/macasyncsocket.h
+++ b/webrtc/base/macasyncsocket.h
@@ -90,7 +90,7 @@
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 906229c..0acf8d7 100644
--- a/webrtc/base/maccocoasocketserver.h
+++ b/webrtc/base/maccocoasocketserver.h
@@ -40,7 +40,7 @@
// 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 b0a82179..df82b4e 100644
--- a/webrtc/base/messagehandler.h
+++ b/webrtc/base/messagehandler.h
@@ -29,7 +29,7 @@
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 e0cab8f..23dbafc 100644
--- a/webrtc/base/messagequeue.h
+++ b/webrtc/base/messagequeue.h
@@ -248,7 +248,7 @@
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 1eeef5c..a099230 100644
--- a/webrtc/base/multipart.h
+++ b/webrtc/base/multipart.h
@@ -75,7 +75,7 @@
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 e987021..eb470dc 100644
--- a/webrtc/base/natserver.h
+++ b/webrtc/base/natserver.h
@@ -116,7 +116,7 @@
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 3519cf0..9ca0739 100644
--- a/webrtc/base/natsocketfactory.h
+++ b/webrtc/base/natsocketfactory.h
@@ -56,7 +56,7 @@
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 @@
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 867f594..a28ce62 100644
--- a/webrtc/base/nssidentity.h
+++ b/webrtc/base/nssidentity.h
@@ -60,7 +60,7 @@
SECKEYPublicKey* pubkey_;
SSLKEAType ssl_kea_type_;
- DISALLOW_COPY_AND_ASSIGN(NSSKeyPair);
+ RTC_DISALLOW_COPY_AND_ASSIGN(NSSKeyPair);
};
@@ -109,7 +109,7 @@
CERTCertificate* certificate_;
scoped_ptr<SSLCertChain> 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 @@
rtc::scoped_ptr<NSSKeyPair> keypair_;
rtc::scoped_ptr<NSSCertificate> 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 72de6c0..d8ba138 100644
--- a/webrtc/base/opensslidentity.h
+++ b/webrtc/base/opensslidentity.h
@@ -45,7 +45,7 @@
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 @@
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 @@
scoped_ptr<OpenSSLKeyPair> key_pair_;
scoped_ptr<OpenSSLCertificate> 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 6289035..68a35b2 100644
--- a/webrtc/base/profiler.h
+++ b/webrtc/base/profiler.h
@@ -134,7 +134,7 @@
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 @@
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 711ed55..adb26ae 100644
--- a/webrtc/base/proxyserver.h
+++ b/webrtc/base/proxyserver.h
@@ -55,7 +55,7 @@
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 @@
SocketAddress ext_ip_;
scoped_ptr<AsyncSocket> server_socket_;
BindingList bindings_;
- DISALLOW_COPY_AND_ASSIGN(ProxyServer);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ProxyServer);
};
// SocksProxyServer is a simple extension of ProxyServer to implement SOCKS.
@@ -90,7 +90,7 @@
}
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 7138c8c..f955986 100644
--- a/webrtc/base/referencecountedsingletonfactory.h
+++ b/webrtc/base/referencecountedsingletonfactory.h
@@ -77,7 +77,7 @@
CriticalSection crit_;
int ref_count_;
- DISALLOW_COPY_AND_ASSIGN(ReferenceCountedSingletonFactory);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ReferenceCountedSingletonFactory);
};
template <typename Interface>
@@ -149,7 +149,7 @@
Interface* instance_;
ReferenceCountedSingletonFactory<Interface>* 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 25434fb..e105380 100644
--- a/webrtc/base/rollingaccumulator.h
+++ b/webrtc/base/rollingaccumulator.h
@@ -165,7 +165,7 @@
mutable bool min_stale_;
std::vector<T> 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 be94ace..9aac112 100644
--- a/webrtc/base/scoped_autorelease_pool.h
+++ b/webrtc/base/scoped_autorelease_pool.h
@@ -50,7 +50,7 @@
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 676343e..203a001 100644
--- a/webrtc/base/scoped_ptr.h
+++ b/webrtc/base/scoped_ptr.h
@@ -298,7 +298,7 @@
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 47dff65..cfdb6f9 100644
--- a/webrtc/base/scopedptrcollection.h
+++ b/webrtc/base/scopedptrcollection.h
@@ -52,7 +52,7 @@
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 30b8ed9..933173e 100644
--- a/webrtc/base/scopedptrcollection_unittest.cc
+++ b/webrtc/base/scopedptrcollection_unittest.cc
@@ -28,7 +28,7 @@
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 aaaba3b..a6ca573 100644
--- a/webrtc/base/sharedexclusivelock.h
+++ b/webrtc/base/sharedexclusivelock.h
@@ -36,7 +36,7 @@
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 @@
private:
SharedExclusiveLock* lock_;
- DISALLOW_COPY_AND_ASSIGN(SharedScope);
+ RTC_DISALLOW_COPY_AND_ASSIGN(SharedScope);
};
class SCOPED_LOCKABLE ExclusiveScope {
@@ -67,7 +67,7 @@
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 3a9205c..4dda889 100644
--- a/webrtc/base/signalthread.h
+++ b/webrtc/base/signalthread.h
@@ -112,7 +112,7 @@
private:
SignalThread* parent_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(Worker);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Worker);
};
class SCOPED_LOCKABLE EnterExit {
@@ -135,7 +135,7 @@
private:
SignalThread* t_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(EnterExit);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EnterExit);
};
void Run();
@@ -147,7 +147,7 @@
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 1750101..fe6c602 100644
--- a/webrtc/base/signalthread_unittest.cc
+++ b/webrtc/base/signalthread_unittest.cc
@@ -57,7 +57,7 @@
private:
SignalThreadTest* harness_;
- DISALLOW_COPY_AND_ASSIGN(SlowSignalThread);
+ RTC_DISALLOW_COPY_AND_ASSIGN(SlowSignalThread);
};
void OnWorkComplete(rtc::SignalThread* thread) {
@@ -128,7 +128,7 @@
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 ae781a9..cdbd44a 100755
--- a/webrtc/base/sigslottester.h
+++ b/webrtc/base/sigslottester.h
@@ -71,7 +71,7 @@
int callback_count_;
C1* capture1_;
- DISALLOW_COPY_AND_ASSIGN(SigslotTester1);
+ RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester1);
};
template <class A1, class A2, class C1, class C2>
@@ -97,7 +97,7 @@
C1* capture1_;
C2* capture2_;
- DISALLOW_COPY_AND_ASSIGN(SigslotTester2);
+ RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester2);
};
template <class A1, class A2, class A3, class C1, class C2, class C3>
@@ -125,7 +125,7 @@
C2* capture2_;
C3* capture3_;
- DISALLOW_COPY_AND_ASSIGN(SigslotTester3);
+ RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester3);
};
template <class A1, class A2, class A3, class A4, class C1, class C2, class C3,
@@ -157,7 +157,7 @@
C3* capture3_;
C4* capture4_;
- DISALLOW_COPY_AND_ASSIGN(SigslotTester4);
+ RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester4);
};
template <class A1, class A2, class A3, class A4, class A5, class C1, class C2,
@@ -192,7 +192,7 @@
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 2fd9386..4410991 100755
--- a/webrtc/base/sigslottester.h.pump
+++ b/webrtc/base/sigslottester.h.pump
@@ -76,7 +76,7 @@
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 08ab5eb..d2eb8c1 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 @@
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 fe6e7b0..b7d3d4b4 100644
--- a/webrtc/base/socketadapters.h
+++ b/webrtc/base/socketadapters.h
@@ -50,7 +50,7 @@
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 @@
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 @@
protected:
void ProcessInput(char* data, size_t* len) override;
- DISALLOW_COPY_AND_ASSIGN(AsyncSSLServerSocket);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AsyncSSLServerSocket);
};
///////////////////////////////////////////////////////////////////////////////
@@ -137,7 +137,7 @@
} 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 @@
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 @@
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 @@
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 @@
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 8761156..fd8b559 100644
--- a/webrtc/base/socketstream.h
+++ b/webrtc/base/socketstream.h
@@ -51,7 +51,7 @@
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 47694bb..acbd94e 100644
--- a/webrtc/base/sslidentity.h
+++ b/webrtc/base/sslidentity.h
@@ -104,7 +104,7 @@
std::vector<SSLCertificate*> 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 b331766..c57daae 100644
--- a/webrtc/base/stream.h
+++ b/webrtc/base/stream.h
@@ -228,7 +228,7 @@
void OnMessage(Message* msg) override;
private:
- DISALLOW_COPY_AND_ASSIGN(StreamInterface);
+ RTC_DISALLOW_COPY_AND_ASSIGN(StreamInterface);
};
///////////////////////////////////////////////////////////////////////////////
@@ -305,7 +305,7 @@
private:
StreamInterface* stream_;
bool owned_;
- DISALLOW_COPY_AND_ASSIGN(StreamAdapterInterface);
+ RTC_DISALLOW_COPY_AND_ASSIGN(StreamAdapterInterface);
};
///////////////////////////////////////////////////////////////////////////////
@@ -337,7 +337,7 @@
scoped_ptr<StreamInterface> tap_;
StreamResult tap_result_;
int tap_error_;
- DISALLOW_COPY_AND_ASSIGN(StreamTap);
+ RTC_DISALLOW_COPY_AND_ASSIGN(StreamTap);
};
///////////////////////////////////////////////////////////////////////////////
@@ -415,7 +415,7 @@
FILE* file_;
private:
- DISALLOW_COPY_AND_ASSIGN(FileStream);
+ RTC_DISALLOW_COPY_AND_ASSIGN(FileStream);
};
///////////////////////////////////////////////////////////////////////////////
@@ -458,7 +458,7 @@
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 @@
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 @@
bool hex_mode_;
LogMultilineState lms_;
- DISALLOW_COPY_AND_ASSIGN(LoggingAdapter);
+ RTC_DISALLOW_COPY_AND_ASSIGN(LoggingAdapter);
};
///////////////////////////////////////////////////////////////////////////////
@@ -670,7 +670,7 @@
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 @@
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 a9cb704..1135a73 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 @@
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 @@
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 @@
}
MyTaskRunner task_runner_;
- DISALLOW_COPY_AND_ASSIGN(TaskAbortTest);
+ RTC_DISALLOW_COPY_AND_ASSIGN(TaskAbortTest);
};
TEST(start_task_test, Abort) {
@@ -363,7 +363,7 @@
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 @@
}
MyTaskRunner task_runner_;
- DISALLOW_COPY_AND_ASSIGN(AbortShouldWakeTest);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AbortShouldWakeTest);
};
TEST(start_task_test, AbortShouldWake) {
@@ -477,7 +477,7 @@
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 @@
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 482b2a6..e9342c1 100644
--- a/webrtc/base/taskparent.h
+++ b/webrtc/base/taskparent.h
@@ -53,7 +53,7 @@
bool child_error_;
typedef std::set<Task *> ChildSet;
scoped_ptr<ChildSet> 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 cd2ba36..5d8ee98 100644
--- a/webrtc/base/testclient.h
+++ b/webrtc/base/testclient.h
@@ -89,7 +89,7 @@
AsyncPacketSocket* socket_;
std::vector<Packet*>* 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 b3de441..51d7d53 100644
--- a/webrtc/base/testechoserver.h
+++ b/webrtc/base/testechoserver.h
@@ -65,7 +65,7 @@
typedef std::list<AsyncTCPSocket*> ClientList;
scoped_ptr<AsyncSocket> 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 3a9efb0..1a04de5 100644
--- a/webrtc/base/thread.h
+++ b/webrtc/base/thread.h
@@ -68,7 +68,7 @@
DWORD key_;
#endif
- DISALLOW_COPY_AND_ASSIGN(ThreadManager);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ThreadManager);
};
struct _SendMessage {
@@ -94,7 +94,7 @@
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 @@
friend class ThreadManager;
- DISALLOW_COPY_AND_ASSIGN(Thread);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Thread);
};
// AutoThread automatically installs itself at construction
@@ -300,7 +300,7 @@
~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 @@
virtual void Run();
private:
- DISALLOW_COPY_AND_ASSIGN(ComThread);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ComThread);
};
#endif
@@ -332,7 +332,7 @@
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 3c49631..a193248 100644
--- a/webrtc/base/thread_checker_unittest.cc
+++ b/webrtc/base/thread_checker_unittest.cc
@@ -49,7 +49,7 @@
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 @@
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 @@
private:
scoped_ptr<ThreadCheckerClass> 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 c708bb4..f2938ff 100644
--- a/webrtc/base/virtualsocketserver.h
+++ b/webrtc/base/virtualsocketserver.h
@@ -243,7 +243,7 @@
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 8bd8060..8e63780 100644
--- a/webrtc/base/win32regkey.h
+++ b/webrtc/base/win32regkey.h
@@ -329,7 +329,7 @@
// 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 d5594e3..17ae8cf 100644
--- a/webrtc/base/worker.h
+++ b/webrtc/base/worker.h
@@ -64,7 +64,7 @@
// 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 918913a..f7c7911 100644
--- a/webrtc/base/x11windowpicker.cc
+++ b/webrtc/base/x11windowpicker.cc
@@ -73,7 +73,7 @@
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 @@
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 d0d7eb1..dda045e 100644
--- a/webrtc/common.h
+++ b/webrtc/common.h
@@ -95,7 +95,7 @@
typedef std::map<OptionIdentifier, BaseOption*> 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 407b5ff..c6fe08e 100644
--- a/webrtc/common_audio/audio_converter.h
+++ b/webrtc/common_audio/audio_converter.h
@@ -58,7 +58,7 @@
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 4307451..cefc62a 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler.h
+++ b/webrtc/common_audio/resampler/push_sinc_resampler.h
@@ -68,7 +68,7 @@
// 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 3f2ec33..189112b 100644
--- a/webrtc/common_audio/resampler/sinc_resampler.h
+++ b/webrtc/common_audio/resampler/sinc_resampler.h
@@ -162,7 +162,7 @@
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 f128180..1807f86 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 @@
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 9322afc..2ba5cf4 100644
--- a/webrtc/common_audio/sparse_fir_filter.h
+++ b/webrtc/common_audio/sparse_fir_filter.h
@@ -44,7 +44,7 @@
const std::vector<float> nonzero_coeffs_;
std::vector<float> 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 2f2e793..14a8a0e 100644
--- a/webrtc/common_audio/wav_file.h
+++ b/webrtc/common_audio/wav_file.h
@@ -58,7 +58,7 @@
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 @@
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 f28542c..25dd233 100644
--- a/webrtc/common_audio/window_generator.h
+++ b/webrtc/common_audio/window_generator.h
@@ -24,7 +24,7 @@
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 0c53842..ffb794a 100644
--- a/webrtc/libjingle/xmpp/pubsubstateclient.h
+++ b/webrtc/libjingle/xmpp/pubsubstateclient.h
@@ -263,7 +263,7 @@
// itemid => StateItemInfo
std::map<std::string, StateItemInfo> 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 2e10d63..5b97e89 100644
--- a/webrtc/libjingle/xmpp/xmpptask.h
+++ b/webrtc/libjingle/xmpp/xmpptask.h
@@ -67,7 +67,7 @@
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 @@
virtual XmppClientInterface* GetClient() = 0;
- DISALLOW_COPY_AND_ASSIGN(XmppTaskParentInterface);
+ RTC_DISALLOW_COPY_AND_ASSIGN(XmppTaskParentInterface);
};
class XmppTaskBase : public XmppTaskParentInterface {
@@ -104,7 +104,7 @@
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 5e9e33d..556268c 100644
--- a/webrtc/modules/audio_coding/codecs/audio_decoder.h
+++ b/webrtc/modules/audio_coding/codecs/audio_decoder.h
@@ -115,7 +115,7 @@
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 686b45a..50d369b 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 @@
// Timestamp of the previously encoded packet.
uint32_t last_encoded_timestamp_;
- DISALLOW_COPY_AND_ASSIGN(AudioEncoderIsacT);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderIsacT);
};
template <typename T>
@@ -122,7 +122,7 @@
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 9fa77b0..4dd5157 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 @@
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 a1e0142..80e9fbe 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 @@
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 8e80ca7..6c12097 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 @@
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 09fe9e6..b0d26ba 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 @@
uint16_t sequence_number_;
std::vector<uint8_t> 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 523498b..7d17cb1 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 @@
std::vector<uint8_t> 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 3372b7f..2337521 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 @@
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 cb533b6..ae7e452 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 @@
rtc::scoped_ptr<AudioEncoder> cng_encoder_;
rtc::scoped_ptr<AudioEncoder> 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 1238b77..f66bc8e 100644
--- a/webrtc/modules/audio_coding/neteq/accelerate.h
+++ b/webrtc/modules/audio_coding/neteq/accelerate.h
@@ -65,7 +65,7 @@
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 6be344b..345f4d5 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 @@
SpeechType* speech_type) override;
private:
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
};
class AudioDecoderPcmA : public AudioDecoder {
@@ -64,7 +64,7 @@
SpeechType* speech_type) override;
private:
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
};
class AudioDecoderPcmUMultiCh : public AudioDecoderPcmU {
@@ -77,7 +77,7 @@
private:
const size_t channels_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh);
};
class AudioDecoderPcmAMultiCh : public AudioDecoderPcmA {
@@ -90,7 +90,7 @@
private:
const size_t channels_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh);
};
#ifdef WEBRTC_CODEC_PCM16
@@ -111,7 +111,7 @@
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 @@
private:
const size_t channels_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16BMultiCh);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16BMultiCh);
};
#endif
@@ -147,7 +147,7 @@
private:
IlbcDecoderInstance* dec_state_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderIlbc);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderIlbc);
};
#endif
@@ -170,7 +170,7 @@
private:
G722DecInst* dec_state_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722);
};
class AudioDecoderG722Stereo : public AudioDecoder {
@@ -199,7 +199,7 @@
G722DecInst* dec_state_left_;
G722DecInst* dec_state_right_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo);
};
#endif
@@ -232,7 +232,7 @@
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 0aae9e3..1c28648 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 @@
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 b44fbff..e046e38 100644
--- a/webrtc/modules/audio_coding/neteq/audio_vector.h
+++ b/webrtc/modules/audio_coding/neteq/audio_vector.h
@@ -105,7 +105,7 @@
// 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 9ad12b7..2c67f21 100644
--- a/webrtc/modules/audio_coding/neteq/background_noise.h
+++ b/webrtc/modules/audio_coding/neteq/background_noise.h
@@ -130,7 +130,7 @@
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 add3cc4..0308706 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 @@
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 d465596..1fc2258 100644
--- a/webrtc/modules/audio_coding/neteq/comfort_noise.h
+++ b/webrtc/modules/audio_coding/neteq/comfort_noise.h
@@ -66,7 +66,7 @@
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 cb3dba0..30f7ddd 100644
--- a/webrtc/modules/audio_coding/neteq/decision_logic.h
+++ b/webrtc/modules/audio_coding/neteq/decision_logic.h
@@ -161,7 +161,7 @@
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 861e2fa..204dcc1 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 @@
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 7867407..7465906 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 @@
// 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 1dbc685..8ce0b69 100644
--- a/webrtc/modules/audio_coding/neteq/decoder_database.h
+++ b/webrtc/modules/audio_coding/neteq/decoder_database.h
@@ -147,7 +147,7 @@
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 b0d3f2e..785fced 100644
--- a/webrtc/modules/audio_coding/neteq/delay_manager.h
+++ b/webrtc/modules/audio_coding/neteq/delay_manager.h
@@ -157,7 +157,7 @@
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 bf8ab74..69433b4 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 @@
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 c40d10a..269c2eb 100644
--- a/webrtc/modules/audio_coding/neteq/dsp_helper.h
+++ b/webrtc/modules/audio_coding/neteq/dsp_helper.h
@@ -130,7 +130,7 @@
// 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 861a948..1f415ce 100644
--- a/webrtc/modules/audio_coding/neteq/dtmf_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h
@@ -107,7 +107,7 @@
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 767f66c..36d902a 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 @@
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 37e58d6..25c8c21 100644
--- a/webrtc/modules/audio_coding/neteq/expand.h
+++ b/webrtc/modules/audio_coding/neteq/expand.h
@@ -140,7 +140,7 @@
size_t expand_duration_samples_;
rtc::scoped_ptr<ChannelParameters[]> 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 54458b9..48e8fd5 100644
--- a/webrtc/modules/audio_coding/neteq/interface/neteq.h
+++ b/webrtc/modules/audio_coding/neteq/interface/neteq.h
@@ -281,7 +281,7 @@
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 727e9a6..a168502 100644
--- a/webrtc/modules/audio_coding/neteq/merge.h
+++ b/webrtc/modules/audio_coding/neteq/merge.h
@@ -96,7 +96,7 @@
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 fca1c2d..8cf89c0 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 @@
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 6a45db6..effecba 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_impl.h
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h
@@ -399,7 +399,7 @@
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 aa24b52..23887f5 100644
--- a/webrtc/modules/audio_coding/neteq/normal.h
+++ b/webrtc/modules/audio_coding/neteq/normal.h
@@ -61,7 +61,7 @@
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 737845e..03c11e6 100644
--- a/webrtc/modules/audio_coding/neteq/packet_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/packet_buffer.h
@@ -148,7 +148,7 @@
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 6023d4e..b0c4b5f 100644
--- a/webrtc/modules/audio_coding/neteq/payload_splitter.h
+++ b/webrtc/modules/audio_coding/neteq/payload_splitter.h
@@ -83,7 +83,7 @@
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 2886cf9..7bf5ad1 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 @@
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 ca48e19..c4c2360 100644
--- a/webrtc/modules/audio_coding/neteq/preemptive_expand.h
+++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.h
@@ -70,7 +70,7 @@
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 8c75eae..61651e5 100644
--- a/webrtc/modules/audio_coding/neteq/random_vector.h
+++ b/webrtc/modules/audio_coding/neteq/random_vector.h
@@ -43,7 +43,7 @@
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 2a765ef..5235397 100644
--- a/webrtc/modules/audio_coding/neteq/rtcp.h
+++ b/webrtc/modules/audio_coding/neteq/rtcp.h
@@ -51,7 +51,7 @@
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 5bb66b66..08235df 100644
--- a/webrtc/modules/audio_coding/neteq/statistics_calculator.h
+++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.h
@@ -160,7 +160,7 @@
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 bbb494e..38e7887 100644
--- a/webrtc/modules/audio_coding/neteq/sync_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/sync_buffer.h
@@ -92,7 +92,7 @@
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 14383d8..00a1415 100644
--- a/webrtc/modules/audio_coding/neteq/time_stretch.h
+++ b/webrtc/modules/audio_coding/neteq/time_stretch.h
@@ -109,7 +109,7 @@
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 fcbb773..9129d84 100644
--- a/webrtc/modules/audio_coding/neteq/timestamp_scaler.h
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h
@@ -61,7 +61,7 @@
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 b4a6a81..a302cff 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 @@
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 87ff688..a897ee5 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 @@
size_t block_length_samples_;
rtc::scoped_ptr<int16_t[]> 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 b7b3ed1..3bd2df5 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 @@
}
private:
- DISALLOW_COPY_AND_ASSIGN(AudioSink);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioSink);
};
// Forks the output audio to two AudioSink objects.
@@ -56,7 +56,7 @@
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 b780fbf..6972303 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 @@
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 fae5573..a6e12db 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 @@
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 ff30f67..a9142a6 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 @@
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 1b1ed42..c36c7da 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 @@
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 a4e48d8..8e43633 100644
--- a/webrtc/modules/audio_coding/neteq/tools/packet.h
+++ b/webrtc/modules/audio_coding/neteq/tools/packet.h
@@ -114,7 +114,7 @@
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 968400c..804a94d 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 @@
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 b15d46f..c0af354 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 @@
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 d144b51..7150bcf 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 @@
rtc::scoped_ptr<rtclog::EventStream> event_log_;
rtc::scoped_ptr<RtpHeaderParser> 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 d711685..d0856a8 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 @@
rtc::scoped_ptr<RtpFileReader> rtp_reader_;
rtc::scoped_ptr<RtpHeaderParser> 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 e09f6e4..6c16192 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 @@
double drift_factor_;
private:
- DISALLOW_COPY_AND_ASSIGN(RtpGenerator);
+ RTC_DISALLOW_COPY_AND_ASSIGN(RtpGenerator);
};
class TimestampJumpRtpGenerator : public RtpGenerator {
@@ -75,7 +75,7 @@
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 f49931e..2d8fafa 100644
--- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
+++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
@@ -119,7 +119,7 @@
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 1a961af..442ddce 100644
--- a/webrtc/modules/audio_processing/beamformer/matrix.h
+++ b/webrtc/modules/audio_processing/beamformer/matrix.h
@@ -360,7 +360,7 @@
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 7ad462c..8dd380b 100644
--- a/webrtc/modules/audio_processing/test/test_utils.h
+++ b/webrtc/modules/audio_processing/test/test_utils.h
@@ -40,7 +40,7 @@
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 a0131e2..a33a0e6 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
@@ -80,7 +80,7 @@
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 9ab6fe9..2c70973 100644
--- a/webrtc/modules/desktop_capture/cropped_desktop_frame.cc
+++ b/webrtc/modules/desktop_capture/cropped_desktop_frame.cc
@@ -20,7 +20,7 @@
private:
rtc::scoped_ptr<DesktopFrame> 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 f5a7fe8..74d25d4 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 @@
DesktopVector restore_position_;
rtc::scoped_ptr<DesktopFrame> 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 b16cf45..7a72031 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 @@
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 d7376b4..49b9646 100644
--- a/webrtc/modules/desktop_capture/desktop_frame.h
+++ b/webrtc/modules/desktop_capture/desktop_frame.h
@@ -91,7 +91,7 @@
rtc::scoped_ptr<DesktopRegion> 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 @@
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 @@
~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 9530fdc..15b5883 100644
--- a/webrtc/modules/desktop_capture/desktop_frame_win.h
+++ b/webrtc/modules/desktop_capture/desktop_frame_win.h
@@ -40,7 +40,7 @@
HBITMAP bitmap_;
rtc::scoped_ptr<SharedMemory> 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 224c691..b3b0e7c 100644
--- a/webrtc/modules/desktop_capture/differ.h
+++ b/webrtc/modules/desktop_capture/differ.h
@@ -81,7 +81,7 @@
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 3b6f859..642cb37 100644
--- a/webrtc/modules/desktop_capture/differ_unittest.cc
+++ b/webrtc/modules/desktop_capture/differ_unittest.cc
@@ -204,7 +204,7 @@
rtc::scoped_ptr<uint8_t[]> 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 bd502f0..fe6f01b 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 @@
MacDesktopConfiguration desktop_configuration_;
rtc::scoped_ptr<EventWrapper> 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 b24fc99..bddc809 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 @@
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 4d1dd1f..a32d470 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 @@
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 1da98a4..dd5dc0e 100644
--- a/webrtc/modules/desktop_capture/mouse_cursor.h
+++ b/webrtc/modules/desktop_capture/mouse_cursor.h
@@ -40,7 +40,7 @@
rtc::scoped_ptr<DesktopFrame> 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 f3b11cf..6cd9e3b 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 @@
static const int kQueueLength = 2;
rtc::scoped_ptr<SharedDesktopFrame> 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 a8be989..cc60203 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_helper.h
+++ b/webrtc/modules/desktop_capture/screen_capturer_helper.h
@@ -80,7 +80,7 @@
// 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 ceb0781..8da56d2 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_mac.mm
+++ b/webrtc/modules/desktop_capture/screen_capturer_mac.mm
@@ -280,7 +280,7 @@
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 @@
private:
rtc::scoped_ptr<DesktopFrame> 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 373e66f..8b83f41 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 @@
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 @@
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 606c061..a3cf6d9 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
+++ b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
@@ -51,7 +51,7 @@
}
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 1597e3f..714583b 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_x11.cc
+++ b/webrtc/modules/desktop_capture/screen_capturer_x11.cc
@@ -121,7 +121,7 @@
// |Differ| for use when polling for changes.
rtc::scoped_ptr<Differ> 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 7651816..97190e0 100644
--- a/webrtc/modules/desktop_capture/shared_desktop_frame.cc
+++ b/webrtc/modules/desktop_capture/shared_desktop_frame.cc
@@ -41,7 +41,7 @@
Atomic32 ref_count_;
rtc::scoped_ptr<DesktopFrame> 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 12d373a..7d18db1 100644
--- a/webrtc/modules/desktop_capture/shared_desktop_frame.h
+++ b/webrtc/modules/desktop_capture/shared_desktop_frame.h
@@ -41,7 +41,7 @@
rtc::scoped_refptr<Core> 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 7870d83..631f119 100644
--- a/webrtc/modules/desktop_capture/shared_memory.h
+++ b/webrtc/modules/desktop_capture/shared_memory.h
@@ -59,7 +59,7 @@
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 0f3e64d..dc3b8c6 100644
--- a/webrtc/modules/desktop_capture/win/desktop.h
+++ b/webrtc/modules/desktop_capture/win/desktop.h
@@ -56,7 +56,7 @@
// 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 366df6d..1cac63e 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 @@
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 @@
}
private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(DeleteObjectTraits);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DeleteObjectTraits);
};
// The traits class that uses DestroyCursor() to close a handle.
@@ -83,7 +83,7 @@
}
private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(DestroyCursorTraits);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DestroyCursorTraits);
};
typedef ScopedGDIObject<HBITMAP, DeleteObjectTraits<HBITMAP> > ScopedBitmap;
diff --git a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h
index 7566e6a..df8652a 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 @@
// The desktop handle assigned to the calling thread at creation.
rtc::scoped_ptr<Desktop> 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 6014a18..202b9aa 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 @@
// 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 b33b873..9ad6b58d9 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 @@
// 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 aa89c12..7c80490 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 @@
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 3acca67..ecf6bee 100644
--- a/webrtc/modules/desktop_capture/window_capturer_mac.mm
+++ b/webrtc/modules/desktop_capture/window_capturer_mac.mm
@@ -66,7 +66,7 @@
rtc::scoped_refptr<FullScreenChromeWindowDetector>
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 d9ad0ca..b74f17e 100755
--- a/webrtc/modules/desktop_capture/window_capturer_null.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_null.cc
@@ -35,7 +35,7 @@
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 3d96881..ba45eaa 100644
--- a/webrtc/modules/desktop_capture/window_capturer_win.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_win.cc
@@ -89,7 +89,7 @@
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 3568305..76c95eb 100755
--- a/webrtc/modules/desktop_capture/window_capturer_x11.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_x11.cc
@@ -82,7 +82,7 @@
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 @@
::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 11c5bf4..0275545 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 @@
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 aa77114..f1f6e11 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 @@
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 98f263f..d1e6632 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 @@
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 b371e47..67019ca 100644
--- a/webrtc/modules/interface/module_common_types.h
+++ b/webrtc/modules/interface/module_common_types.h
@@ -392,7 +392,7 @@
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 @@
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 c181ec0..d0bcf55 100644
--- a/webrtc/modules/pacing/include/packet_router.h
+++ b/webrtc/modules/pacing/include/packet_router.h
@@ -56,7 +56,7 @@
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 b8c47a4..696b780 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 @@
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 35b3a86..9d86ba3 100644
--- a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
+++ b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
@@ -39,7 +39,7 @@
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 b01a62b..e104ba6 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 @@
uint16_t oldest_sequence_number_; // Oldest may not be lowest.
std::map<uint16_t, PacketInfo> 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 ace8551..427bafc 100644
--- a/webrtc/modules/remote_bitrate_estimator/inter_arrival.h
+++ b/webrtc/modules/remote_bitrate_estimator/inter_arrival.h
@@ -78,7 +78,7 @@
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 5a07b4e..bb69a8a 100644
--- a/webrtc/modules/remote_bitrate_estimator/overuse_detector.h
+++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector.h
@@ -59,7 +59,7 @@
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 6499d8d..d671f39 100644
--- a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h
+++ b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h
@@ -63,7 +63,7 @@
double var_noise_;
std::list<double> 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 1bee6bd..bfbe36a 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 @@
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 c2137d8..692f882 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 @@
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 5ca2100..6d07ad1 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 @@
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 ea4e268..b0d0fe7 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 @@
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 0658ec5..b4fe713 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 @@
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 @@
// 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 @@
rtc::scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_;
rtc::scoped_ptr<testing::StreamGenerator> 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 f02e167..d6f049f 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 @@
}
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 0e10f04..c667b68 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe.cc
@@ -70,7 +70,7 @@
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 72e7f73..ef9b314 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe.h
@@ -122,7 +122,7 @@
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 3dca0ab..5fb3252 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 @@
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 dbb5ade..d7abede 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 @@
rtc::scoped_ptr<ResourceFileReader> reader_;
bool fail_to_read_response_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(BaseLineFileVerify);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BaseLineFileVerify);
};
class BaseLineFileUpdate : public BaseLineFileInterface {
@@ -146,7 +146,7 @@
std::vector<uint32_t> 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 e73a545..2881eba 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 @@
private:
explicit ResourceFileReader(FILE* file) : file_(file) {}
FILE* file_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(ResourceFileReader);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ResourceFileReader);
};
class OutputFileWriter {
@@ -50,7 +50,7 @@
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 a84d6f0..2870be8 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 @@
int64_t max_delay_us_;
Stats<double> 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 ceaa637..3cdf4a9 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 @@
uint32_t a_;
uint32_t b_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(Random);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Random);
};
bool IsTimeSorted(const Packets& packets);
@@ -245,7 +245,7 @@
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 @@
// 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 @@
Random random_;
float loss_fraction_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(LossFilter);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LossFilter);
};
class DelayFilter : public PacketProcessor {
@@ -310,7 +310,7 @@
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 @@
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 @@
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 @@
rtc::scoped_ptr<DelayCapHelper> 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 @@
Stats<double> packets_per_second_stats_;
Stats<double> kbps_stats_;
- DISALLOW_COPY_AND_ASSIGN(TraceBasedDeliveryFilter);
+ RTC_DISALLOW_COPY_AND_ASSIGN(TraceBasedDeliveryFilter);
};
class VideoSource {
@@ -450,7 +450,7 @@
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 @@
void SetBitrateBps(int bitrate_bps) override;
private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveVideoSource);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveVideoSource);
};
class PeriodicKeyFrameSource : public AdaptiveVideoSource {
@@ -488,7 +488,7 @@
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 dc82b91..6cd6ee7 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 @@
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 @@
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 @@
Packets output_packets_;
std::vector<int64_t> 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 23fce00..4115d30 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 @@
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 @@
rtc::scoped_ptr<CriticalSectionWrapper> 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 36c3eca..eee90cf 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 @@
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 93279e6..7dfd7a8 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 @@
private:
Clock* clock_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(RembBweSender);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RembBweSender);
};
class RembReceiver : public BweReceiver, public RemoteBitrateObserver {
@@ -73,7 +73,7 @@
int64_t last_feedback_ms_;
rtc::scoped_ptr<RemoteBitrateEstimator> 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 322dced..ab9abc5 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 @@
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 390a1f0..fb9e9fd 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 @@
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 a6acea03..c42647e 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 @@
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 @@
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 9713e43..31c1ec1 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/random.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/random.h
@@ -33,7 +33,7 @@
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 63949f76..b1bc09a 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 @@
rtc::scoped_ptr<TimestampExtrapolator> 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 cfbe8ce..f295401 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h
@@ -140,7 +140,7 @@
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 @@
RTCPUtility::RTCPPacketSR sr_;
std::vector<RTCPUtility::RTCPPacketReportBlockItem> report_blocks_;
- DISALLOW_COPY_AND_ASSIGN(SenderReport);
+ RTC_DISALLOW_COPY_AND_ASSIGN(SenderReport);
};
//
@@ -314,7 +314,7 @@
RTCPUtility::RTCPPacketRR rr_;
std::vector<RTCPUtility::RTCPPacketReportBlockItem> 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 @@
std::vector<uint32_t> ij_items_;
- DISALLOW_COPY_AND_ASSIGN(Ij);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Ij);
};
// Source Description (SDES) (RFC 3550).
@@ -415,7 +415,7 @@
std::vector<Chunk> chunks_;
- DISALLOW_COPY_AND_ASSIGN(Sdes);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Sdes);
};
//
@@ -465,7 +465,7 @@
RTCPUtility::RTCPPacketBYE bye_;
std::vector<uint32_t> csrcs_;
- DISALLOW_COPY_AND_ASSIGN(Bye);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Bye);
};
// Application-Defined packet (APP) (RFC 3550).
@@ -524,7 +524,7 @@
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 @@
RTCPUtility::RTCPPacketPSFBPLI pli_;
- DISALLOW_COPY_AND_ASSIGN(Pli);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Pli);
};
// Slice loss indication (SLI) (RFC 4585).
@@ -630,7 +630,7 @@
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 @@
RTCPUtility::RTCPPacketRTPFBNACK nack_;
std::vector<RTCPUtility::RTCPPacketRTPFBNACKItem> nack_fields_;
- DISALLOW_COPY_AND_ASSIGN(Nack);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Nack);
};
// Reference picture selection indication (RPSI) (RFC 4585).
@@ -723,7 +723,7 @@
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 @@
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 @@
RTCPUtility::RTCPPacketRTPFBTMMBN tmmbn_;
std::vector<RTCPUtility::RTCPPacketRTPFBTMMBRItem> 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 @@
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 @@
std::vector<DlrrBlock> dlrr_blocks_;
std::vector<RTCPUtility::RTCPPacketXRVOIPMetricItem> 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 @@
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 @@
std::vector<RTCPUtility::RTCPPacketXRDLRRReportBlockItem> dlrr_block_;
- DISALLOW_COPY_AND_ASSIGN(Dlrr);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Dlrr);
};
// VoIP Metrics Report Block (RFC 3611).
@@ -1130,7 +1130,7 @@
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 1bca184..4cc1f38 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 @@
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 a7f3c9f..790fe81 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 @@
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 4e92895..d5ad5fd 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 @@
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 2e7bca5..3bf72e9 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 @@
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 d73dfc1b..63db349 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 @@
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 2454fb7..2fe9632 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 @@
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 883fbce..abce7e7 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 @@
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 67babcb..53b678f 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 @@
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 @@
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 3961dff..8a05f1f 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 @@
// 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 e3a2e79..7902d16 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 @@
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 c7a2f66..e53a4ab 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 @@
uint32_t ssrc_;
uint16_t seq_num_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(RawRtpPacket);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RawRtpPacket);
};
class LostPackets {
@@ -182,7 +182,7 @@
Clock* clock_;
int64_t rtt_ms_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(LostPackets);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LostPackets);
};
class SsrcHandlers {
@@ -305,7 +305,7 @@
const PayloadTypes& payload_types_;
LostPackets* lost_packets_;
- DISALLOW_COPY_AND_ASSIGN(Handler);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Handler);
};
typedef std::map<uint32_t, Handler*> HandlerMap;
@@ -315,7 +315,7 @@
PayloadTypes payload_types_;
HandlerMap handlers_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(SsrcHandlers);
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SsrcHandlers);
};
class RtpPlayerImpl : public RtpPlayerInterface {
@@ -467,7 +467,7 @@
bool reordering_;
rtc::scoped_ptr<RawRtpPacket> 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 11fb6d4..47e055c 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 @@
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 2fe646e..6a6362b 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 @@
rtc::scoped_ptr<VideoCodingModule> vcm_;
rtc::scoped_ptr<FileOutputFrameReceiver> 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 ca0ed56..ec94bdc 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 @@
rtc::scoped_ptr<CriticalSectionWrapper> 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 f71fe82..ed96339 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 734ab92..3a15d4a 100644
--- a/webrtc/p2p/base/asyncstuntcpsocket.h
+++ b/webrtc/p2p/base/asyncstuntcpsocket.h
@@ -42,7 +42,7 @@
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 0daf51b..681e7b4 100644
--- a/webrtc/p2p/base/dtlstransportchannel.h
+++ b/webrtc/p2p/base/dtlstransportchannel.h
@@ -45,7 +45,7 @@
rtc::StreamState state_;
rtc::BufferQueue packets_;
- DISALLOW_COPY_AND_ASSIGN(StreamInterfaceChannel);
+ RTC_DISALLOW_COPY_AND_ASSIGN(StreamInterfaceChannel);
};
@@ -243,7 +243,7 @@
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 34cc849..2e27bd8 100644
--- a/webrtc/p2p/base/p2ptransport.h
+++ b/webrtc/p2p/base/p2ptransport.h
@@ -31,7 +31,7 @@
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 e1dd3fe..139e613 100644
--- a/webrtc/p2p/base/p2ptransportchannel.h
+++ b/webrtc/p2p/base/p2ptransportchannel.h
@@ -254,7 +254,7 @@
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 23acb30..e51c787 100644
--- a/webrtc/p2p/base/packetsocketfactory.h
+++ b/webrtc/p2p/base/packetsocketfactory.h
@@ -50,7 +50,7 @@
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 ced0d2e..7b78a8d 100644
--- a/webrtc/p2p/base/transport.h
+++ b/webrtc/p2p/base/transport.h
@@ -476,7 +476,7 @@
// 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 e0dcc37..f492e4e 100644
--- a/webrtc/p2p/base/transportchannel.h
+++ b/webrtc/p2p/base/transportchannel.h
@@ -157,7 +157,7 @@
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 7166ea0..48851b8 100644
--- a/webrtc/p2p/base/transportchannelimpl.h
+++ b/webrtc/p2p/base/transportchannelimpl.h
@@ -98,7 +98,7 @@
sigslot::signal1<TransportChannelImpl*> 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 e39398a..f10f507 100644
--- a/webrtc/p2p/base/transportchannelproxy.h
+++ b/webrtc/p2p/base/transportchannelproxy.h
@@ -88,7 +88,7 @@
OptionList options_;
std::vector<std::string> 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 49f231b..c1342dd 100644
--- a/webrtc/p2p/stunprober/stunprober.cc
+++ b/webrtc/p2p/stunprober/stunprober.cc
@@ -102,7 +102,7 @@
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 56d5369..88dedd5 100644
--- a/webrtc/p2p/stunprober/stunprober.h
+++ b/webrtc/p2p/stunprober/stunprober.h
@@ -190,7 +190,7 @@
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 867af44..d96db0b 100644
--- a/webrtc/sound/alsasoundsystem.cc
+++ b/webrtc/sound/alsasoundsystem.cc
@@ -223,7 +223,7 @@
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 @@
rtc::scoped_ptr<char[]> 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 @@
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 f95e686..b0cc1a4 100644
--- a/webrtc/sound/alsasoundsystem.h
+++ b/webrtc/sound/alsasoundsystem.h
@@ -95,7 +95,7 @@
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 abc6d50..b44a1df 100644
--- a/webrtc/sound/pulseaudiosoundsystem.cc
+++ b/webrtc/sound/pulseaudiosoundsystem.cc
@@ -206,7 +206,7 @@
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 @@
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 @@
// 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 4e67acc..895b784 100644
--- a/webrtc/sound/pulseaudiosoundsystem.h
+++ b/webrtc/sound/pulseaudiosoundsystem.h
@@ -167,7 +167,7 @@
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 4e8e148..f8a6cf8 100644
--- a/webrtc/sound/sounddevicelocator.h
+++ b/webrtc/sound/sounddevicelocator.h
@@ -46,7 +46,7 @@
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 6ce9446..424ce8e 100644
--- a/webrtc/sound/soundinputstreaminterface.h
+++ b/webrtc/sound/soundinputstreaminterface.h
@@ -60,7 +60,7 @@
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 2b501d6..f56d39b 100644
--- a/webrtc/sound/soundoutputstreaminterface.h
+++ b/webrtc/sound/soundoutputstreaminterface.h
@@ -64,7 +64,7 @@
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 aa9a53a..c386b07 100644
--- a/webrtc/sound/soundsysteminterface.h
+++ b/webrtc/sound/soundsysteminterface.h
@@ -66,7 +66,7 @@
// 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 @@
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 8633e26..36ca144 100644
--- a/webrtc/system_wrappers/interface/atomic32.h
+++ b/webrtc/system_wrappers/interface/atomic32.h
@@ -56,7 +56,7 @@
return (reinterpret_cast<ptrdiff_t>(&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 9d7c811..43df26a 100644
--- a/webrtc/system_wrappers/source/scoped_vector_unittest.cc
+++ b/webrtc/system_wrappers/source/scoped_vector_unittest.cc
@@ -44,7 +44,7 @@
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 @@
LifeCycleState life_cycle_state_;
rtc::scoped_ptr<LifeCycleObject> constructed_life_cycle_object_;
- DISALLOW_COPY_AND_ASSIGN(LifeCycleWatcher);
+ RTC_DISALLOW_COPY_AND_ASSIGN(LifeCycleWatcher);
};
TEST(ScopedVectorTest, LifeCycleWatcher) {
@@ -266,7 +266,7 @@
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 3d8f476..0d19e76 100644
--- a/webrtc/test/fake_network_pipe.h
+++ b/webrtc/test/fake_network_pipe.h
@@ -91,7 +91,7 @@
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 5861e8c..2e55538 100644
--- a/webrtc/test/mac/video_renderer_mac.h
+++ b/webrtc/test/mac/video_renderer_mac.h
@@ -33,7 +33,7 @@
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 c1a0bc8..cb0e407 100644
--- a/webrtc/test/rtp_file_reader.cc
+++ b/webrtc/test/rtp_file_reader.cc
@@ -203,7 +203,7 @@
private:
FILE* file_;
- DISALLOW_COPY_AND_ASSIGN(RtpDumpReader);
+ RTC_DISALLOW_COPY_AND_ASSIGN(RtpDumpReader);
};
enum {
@@ -640,7 +640,7 @@
std::vector<RtpPacketMarker> 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 4acaa27..90c46be 100644
--- a/webrtc/test/rtp_file_writer.cc
+++ b/webrtc/test/rtp_file_writer.cc
@@ -87,7 +87,7 @@
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 c166f28..dab2acd 100644
--- a/webrtc/test/test_suite.h
+++ b/webrtc/test/test_suite.h
@@ -38,7 +38,7 @@
virtual void Initialize();
virtual void Shutdown();
- DISALLOW_COPY_AND_ASSIGN(TestSuite);
+ RTC_DISALLOW_COPY_AND_ASSIGN(TestSuite);
private:
rtc::scoped_ptr<TraceToStderr> trace_to_stderr_;
diff --git a/webrtc/tools/simple_command_line_parser.h b/webrtc/tools/simple_command_line_parser.h
index 6bb3313..c7bed5c 100644
--- a/webrtc/tools/simple_command_line_parser.h
+++ b/webrtc/tools/simple_command_line_parser.h
@@ -91,7 +91,7 @@
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 ccd2a6a..3ef113c 100644
--- a/webrtc/video/call.cc
+++ b/webrtc/video/call.cc
@@ -124,7 +124,7 @@
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 92855e3..c5e890d 100644
--- a/webrtc/video_engine/call_stats.cc
+++ b/webrtc/video_engine/call_stats.cc
@@ -86,7 +86,7 @@
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 79a8af6..a17330a 100644
--- a/webrtc/video_engine/call_stats.h
+++ b/webrtc/video_engine/call_stats.h
@@ -73,7 +73,7 @@
// Observers getting stats reports.
std::list<CallStatsObserver*> 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 40fbf94..51e9111 100644
--- a/webrtc/video_engine/encoder_state_feedback.h
+++ b/webrtc/video_engine/encoder_state_feedback.h
@@ -63,7 +63,7 @@
// 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 323c057..391c5cd 100644
--- a/webrtc/video_engine/overuse_frame_detector.h
+++ b/webrtc/video_engine/overuse_frame_detector.h
@@ -178,7 +178,7 @@
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 b96defd..0d6a1ac 100644
--- a/webrtc/video_engine/payload_router.h
+++ b/webrtc/video_engine/payload_router.h
@@ -77,7 +77,7 @@
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 85f86d0..834c933 100644
--- a/webrtc/video_engine/vie_channel.h
+++ b/webrtc/video_engine/vie_channel.h
@@ -349,7 +349,7 @@
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 fc7a2d1..60db171 100644
--- a/webrtc/video_engine/vie_channel_group.cc
+++ b/webrtc/video_engine/vie_channel_group.cc
@@ -136,7 +136,7 @@
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 4aeb422..d01fc68 100644
--- a/webrtc/voice_engine/channel_manager.h
+++ b/webrtc/voice_engine/channel_manager.h
@@ -91,7 +91,7 @@
size_t iterator_pos_;
std::vector<ChannelOwner> 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 @@
const Config& config_;
rtc::scoped_ptr<RtcEventLog> event_log_;
- DISALLOW_COPY_AND_ASSIGN(ChannelManager);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
};
} // namespace voe
} // namespace webrtc
