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

vm/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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1389 matching lines @@
     return (kind() == RawFunction::kConstructor) && is_static();
   }
   bool IsAbstract() const {
     return kind() == RawFunction::kAbstract;
   }
   bool IsDynamicFunction() const {
     if (is_static()) {
       return false;
     }
     switch (kind()) {
-      case RawFunction::kFunction:
+      case RawFunction::kRegularFunction:
       case RawFunction::kGetterFunction:
       case RawFunction::kSetterFunction:
       case RawFunction::kImplicitGetter:
       case RawFunction::kImplicitSetter:
         return true;
       case RawFunction::kClosureFunction:
       case RawFunction::kConstructor:
       case RawFunction::kConstImplicitGetter:
       case RawFunction::kAbstract:
         return false;
       default:
         UNREACHABLE();
         return false;
     }
   }
   bool IsStaticFunction() const {
     if (!is_static()) {
       return false;
     }
     switch (kind()) {
-      case RawFunction::kFunction:
+      case RawFunction::kRegularFunction:
       case RawFunction::kGetterFunction:
       case RawFunction::kSetterFunction:
       case RawFunction::kImplicitGetter:
       case RawFunction::kImplicitSetter:
       case RawFunction::kConstImplicitGetter:
         return true;
       case RawFunction::kClosureFunction:
       case RawFunction::kConstructor:
         return false;
       default:
@@ skipping 3761 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_