diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-21 16:50:40 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-22 12:44:27 -0700 |
| commit | 2cebb24bfc3247d3e9be138a3350106737455918 (patch) | |
| tree | d04d27d21b3c7733d784e303f01f873bb99e7770 /runtime/reference_table.cc | |
| parent | 1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff) | |
| download | art-2cebb24bfc3247d3e9be138a3350106737455918.tar.gz art-2cebb24bfc3247d3e9be138a3350106737455918.tar.bz2 art-2cebb24bfc3247d3e9be138a3350106737455918.zip | |
Replace NULL with nullptr
Also fixed some lines that were too long, and a few other minor
details.
Change-Id: I6efba5fb6e03eb5d0a300fddb2a75bf8e2f175cb
Diffstat (limited to 'runtime/reference_table.cc')
| -rw-r--r-- | runtime/reference_table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/reference_table.cc b/runtime/reference_table.cc index beba64f158..a31d8ac5ba 100644 --- a/runtime/reference_table.cc +++ b/runtime/reference_table.cc @@ -40,7 +40,7 @@ ReferenceTable::~ReferenceTable() { } void ReferenceTable::Add(mirror::Object* obj) { - DCHECK(obj != NULL); + DCHECK(obj != nullptr); VerifyObject(obj); if (entries_.size() >= max_size_) { LOG(FATAL) << "ReferenceTable '" << name_ << "' " @@ -79,8 +79,8 @@ static size_t GetElementCount(mirror::Object* obj) SHARED_LOCKS_REQUIRED(Locks:: static void DumpSummaryLine(std::ostream& os, mirror::Object* obj, size_t element_count, int identical, int equiv) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - if (obj == NULL) { - os << " NULL reference (count=" << equiv << ")\n"; + if (obj == nullptr) { + os << " null reference (count=" << equiv << ")\n"; return; } if (Runtime::Current()->IsClearedJniWeakGlobal(obj)) { |