| commit | 3acbfa4a3f8272d9a42bdd14e64dedb7db6a7ffe | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sun Jul 17 10:47:11 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Jul 17 10:47:11 2011 -0700 |
| tree | 1c17c3272e1e4fcb9872105d375a2a14eb085989 | |
| parent | d0e7e777c412071a911dd2c008b20b7d879fd392 [diff] | |
| parent | eb4f614f2eb53b92ebd416fa418f550861655887 [diff] |
Merge "Flesh out the logging implementation." into dalvik-dev
diff --git a/src/thread.h b/src/thread.h index 55c1b11..a862e0a 100644 --- a/src/thread.h +++ b/src/thread.h
@@ -83,8 +83,8 @@ static Thread* Attach(); static Thread* Current() { - static Thread self; - return &self; // TODO + void* thread = pthread_getspecific(Thread::pthread_key_self_); + return reinterpret_cast<Thread*>(thread); } uint32_t GetId() const {