diff options
| author | Jean Christophe Beyler <jean.christophe.beyler@intel.com> | 2014-12-04 11:20:20 -0800 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2015-01-21 17:33:12 +0000 |
| commit | 0ada95d8de4b04b5f201b4b7e9c3c2fd2cc321ae (patch) | |
| tree | 97231800ac31c9ae1ce6351ca94d1d35dfc8caf8 /compiler | |
| parent | 03c45ccf104fade857cb01a2b760b08fad5e304a (diff) | |
| download | android_art-0ada95d8de4b04b5f201b4b7e9c3c2fd2cc321ae.tar.gz android_art-0ada95d8de4b04b5f201b4b7e9c3c2fd2cc321ae.tar.bz2 android_art-0ada95d8de4b04b5f201b4b7e9c3c2fd2cc321ae.zip | |
ART: Replace NULL to nullptr in the optimizing compiler
Replace macro NULL to the nullptr variation for C++.
Change-Id: Ib6e48dd4bb3c254343383011b67372622578ca76
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/graph_visualizer.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/nodes.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 6f424ce11d..5f7a121af7 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -369,7 +369,7 @@ void CodeGenerator::BuildNativeGCMap( uint32_t native_offset = pc_info.native_pc; uint32_t dex_pc = pc_info.dex_pc; const uint8_t* references = dex_gc_map.FindBitMap(dex_pc, false); - CHECK(references != NULL) << "Missing ref for dex pc 0x" << std::hex << dex_pc; + CHECK(references != nullptr) << "Missing ref for dex pc 0x" << std::hex << dex_pc; builder.AddEntry(native_offset, references); } } diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index 5d1703e237..99b5219131 100644 --- a/compiler/optimizing/graph_visualizer.cc +++ b/compiler/optimizing/graph_visualizer.cc @@ -66,7 +66,7 @@ class HGraphVisualizerPrinter : public HGraphVisitor { void PrintTime(const char* name) { AddIndent(); - output_ << name << " " << time(NULL) << std::endl; + output_ << name << " " << time(nullptr) << std::endl; } void PrintInt(const char* name, int value) { diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index fb941b542f..bcd3f0aa4b 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -445,7 +445,7 @@ static void RemoveFromUseList(T* user, HUseListNode<T>* current = *list; while (current != nullptr) { if (current->GetUser() == user && current->GetIndex() == input_index) { - if (previous == NULL) { + if (previous == nullptr) { *list = current->GetTail(); } else { previous->SetTail(current->GetTail()); |