From 2cebb24bfc3247d3e9be138a3350106737455918 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Tue, 21 Apr 2015 16:50:40 -0700
Subject: Replace NULL with nullptr

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

Change-Id: I6efba5fb6e03eb5d0a300fddb2a75bf8e2f175cb
---
 runtime/dex_file-inl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/dex_file-inl.h')

diff --git a/runtime/dex_file-inl.h b/runtime/dex_file-inl.h
index c68fdca..760006a 100644
--- a/runtime/dex_file-inl.h
+++ b/runtime/dex_file-inl.h
@@ -32,7 +32,7 @@ inline int32_t DexFile::GetStringLength(const StringId& string_id) const {
 
 inline const char* DexFile::GetStringDataAndUtf16Length(const StringId& string_id,
                                                         uint32_t* utf16_length) const {
-  DCHECK(utf16_length != NULL) << GetLocation();
+  DCHECK(utf16_length != nullptr) << GetLocation();
   const uint8_t* ptr = begin_ + string_id.string_data_off_;
   *utf16_length = DecodeUnsignedLeb128(&ptr);
   return reinterpret_cast<const char*>(ptr);
-- 
cgit v1.1