diff options
| author | 2012-06-28 20:43:49 -0700 | |
|---|---|---|
| committer | 2012-06-28 20:43:49 -0700 | |
| commit | 026b14660723c2b25a4f3ef6394f43a4fe64ba92 (patch) | |
| tree | c896d6abf1e1c2bce7607ad41f491fe613da0e5e | |
| parent | bc2c29126c898a83eb0b90a51a8409fcffd899d8 (diff) | |
Fix build; JDWP::ObjectId feels like a pointer but is actually an int.
Change-Id: I23460f0540115f5cc875f2da178bb99660de1262
| -rw-r--r-- | src/debugger.h | 2 | ||||
| -rw-r--r-- | src/jdwp/jdwp_handler.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/debugger.h b/src/debugger.h index 542a006f82..4c0c1b62dc 100644 --- a/src/debugger.h +++ b/src/debugger.h @@ -189,7 +189,7 @@ class Dbg { static bool IsSuspended(JDWP::ObjectId threadId); //static void WaitForSuspend(JDWP::ObjectId threadId); - // Fills 'thread_ids' with the threads in the given thread group. If thread_group_id == NULL, + // Fills 'thread_ids' with the threads in the given thread group. If thread_group_id == 0, // returns all threads. static void GetThreads(JDWP::ObjectId thread_group_id, std::vector<JDWP::ObjectId>& thread_ids); static void GetChildThreadGroups(JDWP::ObjectId thread_group_id, std::vector<JDWP::ObjectId>& child_thread_group_ids); diff --git a/src/jdwp/jdwp_handler.cc b/src/jdwp/jdwp_handler.cc index 7a796feff6..36fbaf1c54 100644 --- a/src/jdwp/jdwp_handler.cc +++ b/src/jdwp/jdwp_handler.cc @@ -209,7 +209,7 @@ static JdwpError VM_ClassesBySignature(JdwpState*, const uint8_t* buf, int, Expa */ static JdwpError VM_AllThreads(JdwpState*, const uint8_t*, int, ExpandBuf* pReply) { std::vector<ObjectId> thread_ids; - Dbg::GetThreads(NULL, thread_ids); + Dbg::GetThreads(0, thread_ids); expandBufAdd4BE(pReply, thread_ids.size()); for (uint32_t i = 0; i < thread_ids.size(); ++i) { |