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/mirror/string.cc | |
parent | 1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff) | |
download | art-2cebb24bfc3247d3e9be138a3350106737455918.zip art-2cebb24bfc3247d3e9be138a3350106737455918.tar.gz art-2cebb24bfc3247d3e9be138a3350106737455918.tar.bz2 |
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/mirror/string.cc')
-rw-r--r-- | runtime/mirror/string.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ int32_t String::FastIndexOf(int32_t ch, int32_t start) { 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 @@ bool String::Equals(String* that) { 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()) { |