commit 58ae9416e197ae68ed12ed43d87407d4dfb15093
author Brian Carlstrom <bdc@google.com> Tue Oct 04 00:56:06 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 04 10:39:42 2011 -0700
tree 9fa93ce844f931155bf4a1d060f091f3285fb205
parent 4d0207c3ed28bbbb8c583a3c3a37f00d1cd4dedc

Simplify command line arguments

Change-Id: I9d6902b0c447fd8fbe5600fd36139791b2ceefb7

src/heap.h

diff --git a/src/heap.h b/src/heap.h
index b669a86..76e33b5 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -41,12 +41,11 @@
 
   typedef void (RootVisitor)(const Object* root, void* arg);
 
-  // Create a heap with the requested sizes. The optional boot image may
-  // be NULL, otherwise it is an image filename created by ImageWriter.
-  // image_file_names specifies application images to load.
+  // Create a heap with the requested sizes. The possible empty
+  // image_file_names names specify Spaces to load based on
+  // ImageWriter output.
   static void Init(size_t starting_size, size_t maximum_size,
-                   const char* boot_image_file_name,
-                   std::vector<const char*>& image_file_names);
+                   const std::vector<std::string>& image_file_names);
 
   static void Destroy();
 
@@ -105,10 +104,6 @@
     return spaces_;
   }
 
-  static Space* GetBootSpace() {
-    return boot_space_;
-  }
-
   static HeapBitmap* GetLiveBits() {
     return live_bitmap_;
   }
@@ -199,10 +194,6 @@
 
   static std::vector<Space*> spaces_;
 
-  // Space loaded from an image
-  // TODO: remove after intern_addr is removed
-  static Space* boot_space_;
-
   // default Space for allocations
   static Space* alloc_space_;