Rename some of the enum definitions inside classes to avoid conflict with the ObjectKind enum.

vm/snapshot.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_SNAPSHOT_H_
 #define VM_SNAPSHOT_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
 #include "vm/datastream.h"
 #include "vm/globals.h"
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 // Forward declarations.
 class AbstractType;
 class AbstractTypeArguments;
 class Array;
 class Class;
+class ClassTable;
 class GrowableObjectArray;
 class Heap;
 class Library;
 class Object;
 class ObjectStore;
 class RawAbstractTypeArguments;
 class RawArray;
 class RawBigint;
 class RawClass;
 class RawContext;
@@ skipping 130 matching lines @@
 
 // Reads a snapshot into objects.
 class SnapshotReader : public BaseReader {
  public:
   SnapshotReader(const Snapshot* snapshot, Isolate* isolate);
   ~SnapshotReader() { }
 
   Isolate* isolate() const { return isolate_; }
   Heap* heap() const { return isolate_->heap(); }
   ObjectStore* object_store() const { return isolate_->object_store(); }
+  ClassTable* class_table() const { return isolate_->class_table(); }
   Object* ObjectHandle() { return &obj_; }
   String* StringHandle() { return &str_; }
   AbstractType* TypeHandle() { return &type_; }
   AbstractTypeArguments* TypeArgumentsHandle() { return &type_arguments_; }
   Array* TokensHandle() { return &tokens_; }
 
   // Reads an object.
   RawObject* ReadObject();
 
   // Add object to backward references.
@@ skipping 294 matching lines @@
  private:
   SnapshotWriter* writer_;
   bool as_references_;
 
   DISALLOW_COPY_AND_ASSIGN(SnapshotWriterVisitor);
 };
 
 }  // namespace dart
 
 #endif  // VM_SNAPSHOT_H_