commit 2cebb24bfc3247d3e9be138a3350106737455918
author Mathieu Chartier <mathieuc@google.com> Tue Apr 21 16:50:40 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Apr 22 12:44:27 2015 -0700
tree d04d27d21b3c7733d784e303f01f873bb99e7770
parent 1f02f1a7b3073b8fef07770a67fbf94afad317f0

Replace NULL with nullptr

Also fixed some lines that were too long, and a few other minor
details.

Change-Id: I6efba5fb6e03eb5d0a300fddb2a75bf8e2f175cb

runtime/mirror/string.cc

diff --git a/runtime/mirror/string.cc b/runtime/mirror/string.cc
index bd6a63c..b7fd240 100644
--- a/runtime/mirror/string.cc
+++ b/runtime/mirror/string.cc
@@ -53,7 +53,7 @@
 
 void String::SetClass(Class* java_lang_String) {
   CHECK(java_lang_String_.IsNull());
-  CHECK(java_lang_String != NULL);
+  CHECK(java_lang_String != nullptr);
   java_lang_String_ = GcRoot<Class>(java_lang_String);
 }
 
@@ -137,7 +137,7 @@
   if (this == that) {
     // Quick reference equality test
     return true;
-  } else if (that == NULL) {
+  } else if (that == nullptr) {
     // Null isn't an instanceof anything
     return false;
   } else if (this->GetLength() != that->GetLength()) {