diff options
| author | 2014-03-18 11:58:24 +0000 | |
|---|---|---|
| committer | 2014-03-18 11:58:24 +0000 | |
| commit | 43c86422e210a3883729ab90997711e79f26bccc (patch) | |
| tree | 6d6697e11ebf1c39fcb129baeeaa9bc7bbace9ed | |
| parent | a48850ba1f48066785768d2dd296448cd430d494 (diff) | |
Fix lint error, and Makefile that could be confused with local files.
Change-Id: I780cc0d6593eadd6f82e1126d7ad445894af666c
| -rw-r--r-- | build/Android.cpplint.mk | 2 | ||||
| -rw-r--r-- | compiler/optimizing/nodes.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.cpplint.mk b/build/Android.cpplint.mk index adb87cb4e9..1ecad211d5 100644 --- a/build/Android.cpplint.mk +++ b/build/Android.cpplint.mk @@ -16,7 +16,7 @@ ART_CPPLINT := art/tools/cpplint.py ART_CPPLINT_FILTER := --filter=-whitespace/line_length,-build/include,-readability/function,-readability/streams,-readability/todo,-runtime/references,-runtime/sizeof,-runtime/threadsafe_fn,-runtime/printf -ART_CPPLINT_SRC := $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION) | grep -v art/compiler/llvm/generated/) +ART_CPPLINT_SRC := $(shell find art -name "*.h" -o -name "*$(ART_CPP_EXTENSION)" | grep -v art/compiler/llvm/generated/) # "mm cpplint-art" to verify we aren't regressing .PHONY: cpplint-art diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index b8b4a3b0fe..498deba2b4 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -122,7 +122,7 @@ void HGraph::VisitBlockForDominatorTree(HBasicBlock* block, void HBasicBlock::AddInstruction(HInstruction* instruction) { DCHECK(instruction->GetBlock() == nullptr); - DCHECK(instruction->GetId() == -1); + DCHECK_EQ(instruction->GetId(), -1); instruction->SetBlock(this); instruction->SetId(GetGraph()->GetNextInstructionId()); if (first_instruction_ == nullptr) { |