commit 8a48741b96ca9cc5835cac72ac133c4ca480930f
author Brian Carlstrom <bdc@google.com> Mon Aug 29 20:08:52 2011 -0700
committer Brian Carlstrom <bdc@google.com> Mon Aug 29 23:29:56 2011 -0700
tree bbab3d50aa6eebb2a8182a7dac0caf7046104a1a
parent a19f2a5240fcf5baf989a26c7a6cf37247432c1b

Allow compilation of classes in different ClassLoaders

Change-Id: Ib0420471590a4c6d16bc25285ef3876098eacb36

src/object_test.cc

diff --git a/src/object_test.cc b/src/object_test.cc
index a862f71..1967ea7 100644
--- a/src/object_test.cc
+++ b/src/object_test.cc
@@ -275,9 +275,9 @@
   ClassLinker* linker = class_linker_;
 
   scoped_ptr<const DexFile> proto1_dex_file(OpenTestDexFile("ProtoCompare"));
-  PathClassLoader* class_loader_1 = AllocPathClassLoader(proto1_dex_file.get());
+  const PathClassLoader* class_loader_1 = AllocPathClassLoader(proto1_dex_file.get());
   scoped_ptr<const DexFile> proto2_dex_file(OpenTestDexFile("ProtoCompare2"));
-  PathClassLoader* class_loader_2 = AllocPathClassLoader(proto2_dex_file.get());
+  const PathClassLoader* class_loader_2 = AllocPathClassLoader(proto2_dex_file.get());
 
   Class* klass1 = linker->FindClass("LProtoCompare;", class_loader_1);
   ASSERT_TRUE(klass1 != NULL);
@@ -324,7 +324,7 @@
 
 TEST_F(ObjectTest, InstanceOf) {
   scoped_ptr<const DexFile> dex(OpenTestDexFile("XandY"));
-  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
+  const PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
   Class* X = class_linker_->FindClass("LX;", class_loader);
   Class* Y = class_linker_->FindClass("LY;", class_loader);
   ASSERT_TRUE(X != NULL);
@@ -351,7 +351,7 @@
 
 TEST_F(ObjectTest, IsAssignableFrom) {
   scoped_ptr<const DexFile> dex(OpenTestDexFile("XandY"));
-  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
+  const PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
   Class* X = class_linker_->FindClass("LX;", class_loader);
   Class* Y = class_linker_->FindClass("LY;", class_loader);
 
@@ -363,7 +363,7 @@
 
 TEST_F(ObjectTest, IsAssignableFromArray) {
   scoped_ptr<const DexFile> dex(OpenTestDexFile("XandY"));
-  PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
+  const PathClassLoader* class_loader = AllocPathClassLoader(dex.get());
   Class* X = class_linker_->FindClass("LX;", class_loader);
   Class* Y = class_linker_->FindClass("LY;", class_loader);
   ASSERT_TRUE(X != NULL);