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/class_linker.h

diff --git a/src/class_linker.h b/src/class_linker.h
index d7bb191..9d6c53e 100644
--- a/src/class_linker.h
+++ b/src/class_linker.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "macros.h"
-#include "raw_dex_file.h"
+#include "dex_file.h"
 #include "thread.h"
 #include "object.h"
 #include "gtest/gtest.h"
@@ -22,8 +22,8 @@
 
   ~ClassLinker() {}
 
-  DexFile* AllocDexFile();
-  Class* AllocClass(DexFile* dex_file);
+  DexCache* AllocDexCache();
+  Class* AllocClass(DexCache* dex_cache);
   StaticField* AllocStaticField();
   InstanceField* AllocInstanceField();
   Method* AllocMethod();
@@ -64,9 +64,9 @@
 
   Class* FindPrimitiveClass(char type);
 
-  const RawDexFile* FindRawDexFile(const DexFile* dex_file) const;
+  const RawDexFile* FindRawDexFile(const DexCache* dex_file) const;
 
-  DexFile* FindDexFile(const RawDexFile* raw_dex_file) const;
+  DexCache* FindDexCache(const RawDexFile* raw_dex_file) const;
 
   typedef std::pair<const RawDexFile*, const RawDexFile::ClassDef*> ClassPathEntry;
 
@@ -148,7 +148,7 @@
 
   std::vector<RawDexFile*> raw_dex_files_;
 
-  std::vector<DexFile*> dex_files_;
+  std::vector<DexCache*> dex_caches_;
 
   // TODO: multimap
   typedef std::map<const StringPiece, Class*> Table;