commit 7e49dca262933bc30cbc8b9f07cfc8cce2343389
author Brian Carlstrom <bdc@google.com> Fri Jul 22 18:07:34 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sat Jul 23 12:01:58 2011 -0700
tree c7413689d9d71aa15af72ea936befae639289fcd
parent 6547ace95d86e0f1aec8a0abc76fe87838a81815

Rename DexFile to DexCache

Change-Id: I93fa3e4f7cf87fbaac974f0d2577628a23f0d8c2

src/object.h

diff --git a/src/object.h b/src/object.h
index abbf6ca..770e8bb 100644
--- a/src/object.h
+++ b/src/object.h
@@ -16,7 +16,7 @@
 
 class Array;
 class Class;
-class DexFile;
+class DexCache;
 class InstanceField;
 class InterfaceEntry;
 class Monitor;
@@ -385,7 +385,7 @@
   }
 
   // const char* GetReturnTypeDescriptor() const {
-  //   return declaring_class_->GetDexFile_->GetRaw()
+  //   return FindDexFile(declaring_class_->GetDexCache()
   //          ->dexStringByTypeIdx(proto_id_.return_type_id_);
   // }
 
@@ -596,8 +596,8 @@
     return class_loader_;
   }
 
-  DexFile* GetDexFile() const {
-    return dex_file_;
+  DexCache* GetDexCache() const {
+    return dex_cache_;
   }
 
   Class* GetComponentType() const {
@@ -779,9 +779,9 @@
   // access flags; low 16 bits are defined by VM spec
   uint32_t access_flags_;  // TODO: make an instance field?
 
-  // DexFile from which we came; needed to resolve constant pool entries
+  // DexCache of resolved constant pool entries
   // (will be NULL for VM-generated, e.g. arrays and primitive classes)
-  DexFile* dex_file_;
+  DexCache* dex_cache_;
 
   // state of class initialization
   Status status_;
@@ -924,7 +924,7 @@
 
 class CharArray : public Array {
  private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(CharArray);
+  CharArray();
 };
 
 class ObjectArray : public Array {