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

vm/runtime_entry_test.cc

 // Copyright (c) 2011, 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.
 
 #include "vm/runtime_entry.h"
 
 #include "vm/object.h"
 #include "vm/verifier.h"
 
 namespace dart {
 
 // Add function to a class and that class to the class dictionary so that
 // frame walking can be used.
 const Function& RegisterFakeFunction(const char* name, const Code& code) {
   const String& function_name = String::ZoneHandle(String::NewSymbol(name));
   const Function& function = Function::ZoneHandle(
-      Function::New(function_name, RawFunction::kFunction, true, false, 0));
+      Function::New(function_name, RawFunction::kRegularFunction,
+                    true, false, 0));
   Class& cls = Class::ZoneHandle();
   const Script& script = Script::Handle();
   cls = Class::New(function_name, script, Scanner::kDummyTokenIndex);
   const Array& functions = Array::Handle(Array::New(1));
   functions.SetAt(0, function);
   cls.SetFunctions(functions);
   Library& lib = Library::Handle(Library::CoreLibrary());
   lib.AddClass(cls);
   function.SetCode(code);
   return function;
@@ skipping 22 matching lines @@
                           RawObject* arg0, RawObject* arg1) {
   // Ignoring overflow in the calculation below and using the internal
   // representation of Smi directly without using any handlized code.
   intptr_t result = reinterpret_cast<intptr_t>(arg0) +
       reinterpret_cast<intptr_t>(arg1);
   return reinterpret_cast<RawObject*>(result);
 }
 END_LEAF_RUNTIME_ENTRY
 
 }  // namespace dart