Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(854)

Unified Diff: webrtc/base/taskparent.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/task_unittest.cc ('k') | webrtc/base/taskrunner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/taskparent.cc
diff --git a/webrtc/base/taskparent.cc b/webrtc/base/taskparent.cc
index f923c5a2eb4641f4e0695a26dd364faaad28564e..aee22a8fc49f06ce421bec5906e747d39f034fc5 100644
--- a/webrtc/base/taskparent.cc
+++ b/webrtc/base/taskparent.cc
@@ -20,17 +20,16 @@ namespace rtc {
TaskParent::TaskParent(Task* derived_instance, TaskParent *parent)
: parent_(parent) {
- RTC_DCHECK(derived_instance != NULL);
- RTC_DCHECK(parent != NULL);
+ RTC_DCHECK(derived_instance != nullptr);
+ RTC_DCHECK(parent != nullptr);
runner_ = parent->GetRunner();
parent_->AddChild(derived_instance);
Initialize();
}
-TaskParent::TaskParent(TaskRunner *derived_instance)
- : parent_(NULL),
- runner_(derived_instance) {
- RTC_DCHECK(derived_instance != NULL);
+TaskParent::TaskParent(TaskRunner* derived_instance)
+ : parent_(nullptr), runner_(derived_instance) {
+ RTC_DCHECK(derived_instance != nullptr);
Initialize();
}
@@ -48,7 +47,7 @@ void TaskParent::AddChild(Task *child) {
#if RTC_DCHECK_IS_ON
bool TaskParent::IsChildTask(Task *task) {
- RTC_DCHECK(task != NULL);
+ RTC_DCHECK(task != nullptr);
return task->parent_ == this && children_->find(task) != children_->end();
}
#endif
« no previous file with comments | « webrtc/base/task_unittest.cc ('k') | webrtc/base/taskrunner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698