diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-19 11:24:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 11:24:48 -0700 |
| commit | ac43ae545ffca66aac813ed3e6ab54e3559b5e4e (patch) | |
| tree | 39fa904ac9ef3086d0b68d39c171e4927eb29070 /runtime/instrumentation.cc | |
| parent | f1694e19322ba9a147b25347fe003482a5d4930d (diff) | |
| parent | 2d88862f0752a7a0e65145b088f49dabd49d4284 (diff) | |
| download | art-ac43ae545ffca66aac813ed3e6ab54e3559b5e4e.tar.gz art-ac43ae545ffca66aac813ed3e6ab54e3559b5e4e.tar.bz2 art-ac43ae545ffca66aac813ed3e6ab54e3559b5e4e.zip | |
am 2d88862f: Fixing cpplint readability/casting issues
* commit '2d88862f0752a7a0e65145b088f49dabd49d4284':
Fixing cpplint readability/casting issues
Diffstat (limited to 'runtime/instrumentation.cc')
| -rw-r--r-- | runtime/instrumentation.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc index 091f66adce..8a05aa4725 100644 --- a/runtime/instrumentation.cc +++ b/runtime/instrumentation.cc @@ -495,7 +495,7 @@ void Instrumentation::PushInstrumentationStackFrame(Thread* self, mirror::Object size_t frame_id = StackVisitor::ComputeNumFrames(self); std::deque<instrumentation::InstrumentationStackFrame>* stack = self->GetInstrumentationStack(); if (kVerboseInstrumentation) { - LOG(INFO) << "Entering " << PrettyMethod(method) << " from PC " << (void*)lr; + LOG(INFO) << "Entering " << PrettyMethod(method) << " from PC " << reinterpret_cast<void*>(lr); } instrumentation::InstrumentationStackFrame instrumentation_frame(this_object, method, lr, frame_id, interpreter_entry); @@ -552,7 +552,8 @@ uint64_t Instrumentation::PopInstrumentationStackFrame(Thread* self, uintptr_t* (static_cast<uint64_t>(*return_pc) << 32); } else { if (kVerboseInstrumentation) { - LOG(INFO) << "Returning from " << PrettyMethod(method) << " to PC " << (void*)(*return_pc); + LOG(INFO) << "Returning from " << PrettyMethod(method) + << " to PC " << reinterpret_cast<void*>(*return_pc); } return *return_pc; } |