diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-02-19 18:55:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-19 18:55:42 +0000 |
| commit | c06fec227cd8da8b0a8be64f7268322f6b563377 (patch) | |
| tree | bc3a6e3002e79d7e374205207eb8d0bfa6b58098 /runtime/thread_list.cc | |
| parent | a2a5354cd95faf242a70b99b7b11f8fdb7cb7c1b (diff) | |
| parent | 815873ecc312b1d231acce71e1a16f42cdaf09f2 (diff) | |
| download | art-c06fec227cd8da8b0a8be64f7268322f6b563377.zip art-c06fec227cd8da8b0a8be64f7268322f6b563377.tar.gz art-c06fec227cd8da8b0a8be64f7268322f6b563377.tar.bz2 | |
Merge "Change root visitor to use Object**."
Diffstat (limited to 'runtime/thread_list.cc')
| -rw-r--r-- | runtime/thread_list.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc index 9f67c96..74e6f1c 100644 --- a/runtime/thread_list.cc +++ b/runtime/thread_list.cc @@ -783,11 +783,10 @@ class VerifyRootWrapperArg { void* const arg_; }; -static mirror::Object* VerifyRootWrapperCallback(mirror::Object* root, void* arg, - uint32_t /*thread_id*/, RootType /*root_type*/) { +static void VerifyRootWrapperCallback(mirror::Object** root, void* arg, uint32_t /*thread_id*/, + RootType /*root_type*/) { VerifyRootWrapperArg* wrapperArg = reinterpret_cast<VerifyRootWrapperArg*>(arg); - wrapperArg->callback_(root, wrapperArg->arg_, 0, NULL); - return root; + wrapperArg->callback_(*root, wrapperArg->arg_, 0, NULL); } void ThreadList::VerifyRoots(VerifyRootCallback* callback, void* arg) const { |