Replace NULL with nullptr or null in webrtc/base/. BUG=webrtc:7147 Review-Url: https://codereview.webrtc.org/2718663005 Cr-Commit-Position: refs/heads/master@{#16878}
diff --git a/webrtc/base/messagequeue.cc b/webrtc/base/messagequeue.cc index 4a30ad1..efe6188 100644 --- a/webrtc/base/messagequeue.cc +++ b/webrtc/base/messagequeue.cc
@@ -49,7 +49,7 @@ //------------------------------------------------------------------ // MessageQueueManager -MessageQueueManager* MessageQueueManager::instance_ = NULL; +MessageQueueManager* MessageQueueManager::instance_ = nullptr; MessageQueueManager* MessageQueueManager::Instance() { // Note: This is not thread safe, but it is first called before threads are @@ -60,7 +60,7 @@ } bool MessageQueueManager::IsInitialized() { - return instance_ != NULL; + return instance_ != nullptr; } MessageQueueManager::MessageQueueManager() : locked_(false) {} @@ -99,7 +99,7 @@ destroy = message_queues_.empty(); } if (destroy) { - instance_ = NULL; + instance_ = nullptr; delete this; } } @@ -214,11 +214,11 @@ // is going away. SignalQueueDestroyed(); MessageQueueManager::Remove(this); - Clear(NULL); + Clear(nullptr); SharedScope ss(&ss_lock_); if (ss_) { - ss_->SetMessageQueue(NULL); + ss_->SetMessageQueue(nullptr); } } @@ -333,7 +333,7 @@ } // If this was a dispose message, delete it and skip it. if (MQID_DISPOSE == pmsg->message_id) { - RTC_DCHECK(NULL == pmsg->phandler); + RTC_DCHECK(nullptr == pmsg->phandler); delete pmsg->pdata; *pmsg = Message(); continue;