zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add RTC_ prefix to contructormagic macros.

Browse Source 
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}
This commit is contained in:
henrikg
2015-09-16 05:37:44 -07:00
committed by Commit bot
parent afb6b5e3e0
commit 3c089d751e
258 changed files with 411 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/main/source/jitter_buffer.h
View File

@ -360,7 +360,7 @@ class VCMJitterBuffer {
// average_packets_per_frame converges fast if we have fewer than this many
// frames.
int frame_counter_;
DISALLOW_COPY_AND_ASSIGN(VCMJitterBuffer);
RTC_DISALLOW_COPY_AND_ASSIGN(VCMJitterBuffer);
};
} // namespace webrtc

2
webrtc/modules/video_coding/main/source/test/stream_generator.h
View File

@ -64,7 +64,7 @@ class StreamGenerator {
int64_t start_time_;
uint8_t packet_buffer_[kMaxPacketSize];
DISALLOW_COPY_AND_ASSIGN(StreamGenerator);
RTC_DISALLOW_COPY_AND_ASSIGN(StreamGenerator);
};
} // namespace webrtc

10
webrtc/modules/video_coding/main/test/rtp_player.cc
View File

@ -66,7 +66,7 @@ class RawRtpPacket {
uint32_t ssrc_;
uint16_t seq_num_;
DISALLOW_IMPLICIT_CONSTRUCTORS(RawRtpPacket);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RawRtpPacket);
};
class LostPackets {
@ -182,7 +182,7 @@ class LostPackets {
Clock* clock_;
int64_t rtt_ms_;
DISALLOW_IMPLICIT_CONSTRUCTORS(LostPackets);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LostPackets);
};
class SsrcHandlers {
@ -305,7 +305,7 @@ class SsrcHandlers {
const PayloadTypes& payload_types_;
LostPackets* lost_packets_;
DISALLOW_COPY_AND_ASSIGN(Handler);
RTC_DISALLOW_COPY_AND_ASSIGN(Handler);
};
typedef std::map<uint32_t, Handler*> HandlerMap;
@ -315,7 +315,7 @@ class SsrcHandlers {
PayloadTypes payload_types_;
HandlerMap handlers_;
DISALLOW_IMPLICIT_CONSTRUCTORS(SsrcHandlers);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SsrcHandlers);
};
class RtpPlayerImpl : public RtpPlayerInterface {
@ -467,7 +467,7 @@ class RtpPlayerImpl : public RtpPlayerInterface {
bool reordering_;
rtc::scoped_ptr<RawRtpPacket> reorder_buffer_;
DISALLOW_IMPLICIT_CONSTRUCTORS(RtpPlayerImpl);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpPlayerImpl);
};
RtpPlayerInterface* Create(const std::string& input_filename,

2
webrtc/modules/video_coding/main/test/test_util.h
View File

@ -68,7 +68,7 @@ class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback {
int height_;
int count_;
DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver);
};
class CmdArgs {

2
webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc
View File

@ -95,7 +95,7 @@ class VcmPayloadSinkFactory::VcmPayloadSink
rtc::scoped_ptr<VideoCodingModule> vcm_;
rtc::scoped_ptr<FileOutputFrameReceiver> frame_receiver_;
DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSink);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSink);
};
VcmPayloadSinkFactory::VcmPayloadSinkFactory(

2
webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h
View File

@ -57,7 +57,7 @@ class VcmPayloadSinkFactory : public PayloadSinkFactoryInterface {
rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
Sinks sinks_;
DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSinkFactory);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSinkFactory);
};
} // namespace rtpplayer
} // namespace webrtc