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

Replace NULL with nullptr or null in webrtc/base/.

Browse Source 
BUG=webrtc:7147

Review-Url: https://codereview.webrtc.org/2718663005
Cr-Commit-Position: refs/heads/master@{#16878}
This commit is contained in:
deadbeef
2017-02-27 14:06:41 -08:00
committed by Commit bot
parent c5da4785f3
commit 37f5ecfd8f
117 changed files with 809 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/base/macutils.cc
View File

@ -24,7 +24,7 @@ namespace rtc {
///////////////////////////////////////////////////////////////////////////////
bool ToUtf8(const CFStringRef str16, std::string* str8) {
if ((NULL == str16) || (NULL == str8)) {
if ((nullptr == str16) || (nullptr == str8)) {
return false;
}
size_t maxlen = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str16),
@ -39,14 +39,14 @@ bool ToUtf8(const CFStringRef str16, std::string* str8) {
}
bool ToUtf16(const std::string& str8, CFStringRef* str16) {
if (NULL == str16) {
if (nullptr == str16) {
return false;
}
*str16 = CFStringCreateWithBytes(kCFAllocatorDefault,
reinterpret_cast<const UInt8*>(str8.data()),
str8.length(), kCFStringEncodingUTF8,
false);
return NULL != *str16;
return nullptr != *str16;
}
void DecodeFourChar(UInt32 fc, std::string* out) {