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

Fix compilation issues of std::unique_ptr

Browse Source 
This patch fixes compilation issues related to usage of std::unique_ptr
and NULL instead of nullptr. This issue pops up once you would try to
compile whole webrtc with using C++14 and gcc-4.9

BUG=webrtc:7461

Review-Url: https://codereview.webrtc.org/2806693004
Cr-Commit-Position: refs/heads/master@{#17600}
This commit is contained in:
steweg
2017-04-09 09:09:06 -07:00
committed by Commit bot
parent 8cc642b555
commit 4b37127414
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -46,6 +46,7 @@ Steve Reid <sreid@sea-to-sky.net>
Vladimir Beloborodov <VladimirTechMan@gmail.com> Vladimir Beloborodov <VladimirTechMan@gmail.com>
Vicken Simonian <vsimon@gmail.com> Vicken Simonian <vsimon@gmail.com>
Victor Costan <costan@gmail.com> Victor Costan <costan@gmail.com>
Stefan Gula <steweg@gmail.com>
&yet LLC <*@andyet.com> &yet LLC <*@andyet.com>
Agora IO <*@agora.io> Agora IO <*@agora.io>

2
webrtc/p2p/base/transportdescription.h
View File

@ -147,7 +147,7 @@ struct TransportDescription {
void AddOption(const std::string& option) { void AddOption(const std::string& option) {
transport_options.push_back(option); transport_options.push_back(option);
} }
bool secure() const { return identity_fingerprint != NULL; } bool secure() const { return identity_fingerprint != nullptr; }
IceParameters GetIceParameters() { IceParameters GetIceParameters() {
return IceParameters(ice_ufrag, ice_pwd, HasOption(ICE_RENOMINATION_STR)); return IceParameters(ice_ufrag, ice_pwd, HasOption(ICE_RENOMINATION_STR));

4
webrtc/pc/videocapturertracksource.cc
View File

@ -262,7 +262,7 @@ rtc::scoped_refptr<VideoTrackSourceInterface> VideoCapturerTrackSource::Create(
const webrtc::MediaConstraintsInterface* constraints, const webrtc::MediaConstraintsInterface* constraints,
bool remote) { bool remote) {
RTC_DCHECK(worker_thread != NULL); RTC_DCHECK(worker_thread != NULL);
RTC_DCHECK(capturer != NULL); RTC_DCHECK(capturer != nullptr);
rtc::scoped_refptr<VideoCapturerTrackSource> source( rtc::scoped_refptr<VideoCapturerTrackSource> source(
new rtc::RefCountedObject<VideoCapturerTrackSource>( new rtc::RefCountedObject<VideoCapturerTrackSource>(
worker_thread, std::move(capturer), remote)); worker_thread, std::move(capturer), remote));
@ -275,7 +275,7 @@ rtc::scoped_refptr<VideoTrackSourceInterface> VideoCapturerTrackSource::Create(
std::unique_ptr<cricket::VideoCapturer> capturer, std::unique_ptr<cricket::VideoCapturer> capturer,
bool remote) { bool remote) {
RTC_DCHECK(worker_thread != NULL); RTC_DCHECK(worker_thread != NULL);
RTC_DCHECK(capturer != NULL); RTC_DCHECK(capturer != nullptr);
rtc::scoped_refptr<VideoCapturerTrackSource> source( rtc::scoped_refptr<VideoCapturerTrackSource> source(
new rtc::RefCountedObject<VideoCapturerTrackSource>( new rtc::RefCountedObject<VideoCapturerTrackSource>(
worker_thread, std::move(capturer), remote)); worker_thread, std::move(capturer), remote));