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

vm/raw_object.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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 521 matching lines @@
   RawAbstractTypeArguments* instantiator_type_arguments_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->instantiator_type_arguments_);
   }
 };
 
 
 class RawFunction : public RawObject {
  public:
   enum Kind {
-    kFunction,
+    kRegularFunction,
     kClosureFunction,
     kSignatureFunction,  // represents a signature only without actual code.
     kGetterFunction,  // represents getter functions e.g: get foo() { .. }.
     kSetterFunction,  // represents setter functions e.g: set foo(..) { .. }.
     kAbstract,
     kConstructor,
     kImplicitGetter,  // represents an implicit getter for fields.
     kImplicitSetter,  // represents an implicit setter for fields.
     kConstImplicitGetter,  // represents an implicit const getter for fields.
   };
@@ skipping 81 matching lines @@
   // Variable length data follows here.
   uint8_t data_[0];
 
   friend class SnapshotReader;
 };
 
 
 class RawScript : public RawObject {
  public:
   enum Kind {
-    kScript = 0,
-    kLibrary,
-    kSource
+    kScriptTag = 0,
+    kLibraryTag,
+    kSourceTag
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(Script);
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->url_); }
   RawString* url_;
   RawString* source_;
   RawTokenStream* tokens_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->tokens_); }
@@ skipping 859 matching lines @@
          kExternalUint64Array == kByteArray + 18 &&
          kExternalFloat32Array == kByteArray + 19 &&
          kExternalFloat64Array == kByteArray + 20 &&
          kClosure == kByteArray + 21);
   return (index >= kByteArray && index <= kClosure);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_