Cleanup.
Change-Id: I15704e76662bcf9bc10560679500c98a4baa68ab
diff --git a/src/thread.h b/src/thread.h
index d511f04..993327d 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -17,6 +17,7 @@
namespace art {
+class ClassLoader;
class Method;
class Object;
class Runtime;
@@ -317,11 +318,11 @@
top_of_managed_stack_ = record.last_top_of_managed_stack;
}
- Object* GetClassLoaderOverride() {
+ ClassLoader* GetClassLoaderOverride() {
return class_loader_override_;
}
- void SetClassLoaderOverride(Object* class_loader_override) {
+ void SetClassLoaderOverride(ClassLoader* class_loader_override) {
class_loader_override_ = class_loader_override;
}
@@ -386,7 +387,9 @@
// at the next poll.
int suspend_count_;
- Object* class_loader_override_;
+ // Needed to get the right ClassLoader in JNI_OnLoad, but also
+ // useful for testing.
+ ClassLoader* class_loader_override_;
// The memory mapping of the stack for non-attached threads.
scoped_ptr<MemMap> stack_;