Index: webrtc/base/macutils.cc |
diff --git a/webrtc/base/macutils.cc b/webrtc/base/macutils.cc |
index 0d9cae2104825a626a3dacb1cc55a0b1c9d879a9..6e90722cf2fef34e2ac4f82f7b4ff75c5d1599e7 100644 |
--- a/webrtc/base/macutils.cc |
+++ b/webrtc/base/macutils.cc |
@@ -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) { |