commit 2d88862f0752a7a0e65145b088f49dabd49d4284
author Brian Carlstrom <bdc@google.com> Thu Jul 18 17:02:00 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu Jul 18 17:02:52 2013 -0700
tree 3fac6bbd9a0ff3836f361e46579151c8a93420b6
parent 751d4ed43e8118f145edf18db4d987daf7dabbae

Fixing cpplint readability/casting issues

Change-Id: I6821da0e23737995a9b884a04e9b63fac640cd05

compiler/dex/quick/codegen_util.cc

diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc
index 8daa397..630e294 100644
--- a/compiler/dex/quick/codegen_util.cc
+++ b/compiler/dex/quick/codegen_util.cc
@@ -190,10 +190,10 @@
   }
 
   if (lir->use_mask && (!lir->flags.is_nop || dump_nop)) {
-    DUMP_RESOURCE_MASK(DumpResourceMask((LIR*) lir, lir->use_mask, "use"));
+    DUMP_RESOURCE_MASK(DumpResourceMask(lir, lir->use_mask, "use"));
   }
   if (lir->def_mask && (!lir->flags.is_nop || dump_nop)) {
-    DUMP_RESOURCE_MASK(DumpResourceMask((LIR*) lir, lir->def_mask, "def"));
+    DUMP_RESOURCE_MASK(DumpResourceMask(lir, lir->def_mask, "def"));
   }
 }
 

compiler/dex/quick/gen_invoke.cc

diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc
index 8840526..13a59bf 100644
--- a/compiler/dex/quick/gen_invoke.cc
+++ b/compiler/dex/quick/gen_invoke.cc
@@ -1113,7 +1113,7 @@
     LoadWordDisp(TargetReg(kSelf), offset, rl_result.low_reg);
   } else {
     CHECK(cu_->instruction_set == kX86);
-    ((X86Mir2Lir*)this)->OpRegThreadMem(kOpMov, rl_result.low_reg, offset);
+    reinterpret_cast<X86Mir2Lir*>(this)->OpRegThreadMem(kOpMov, rl_result.low_reg, offset);
   }
   StoreValue(rl_dest, rl_result);
   return true;

compiler/llvm/runtime_support_builder.cc

diff --git a/compiler/llvm/runtime_support_builder.cc b/compiler/llvm/runtime_support_builder.cc
index 19ccc36..e6479e0 100644
--- a/compiler/llvm/runtime_support_builder.cc
+++ b/compiler/llvm/runtime_support_builder.cc
@@ -43,7 +43,7 @@
 #define GET_RUNTIME_SUPPORT_FUNC_DECL(ID, NAME) \
   do { \
     ::llvm::Function* fn = module_.getFunction(#NAME); \
-    DCHECK_NE(fn, (void*)NULL) << "Function not found: " << #NAME; \
+    DCHECK(fn != NULL) << "Function not found: " << #NAME; \
     runtime_support_func_decls_[runtime_support::ID] = fn; \
   } while (0);