diff -r 36d1d483d5d6 -r da91efe96a93 src/cpu/zero/vm/cppInterpreter_zero.hpp
--- a/src/cpu/zero/vm/cppInterpreter_zero.hpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/src/cpu/zero/vm/cppInterpreter_zero.hpp	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,11 +32,11 @@
 
  public:
   // Method entries
-  static int normal_entry(methodOop method, intptr_t UNUSED, TRAPS);
-  static int native_entry(methodOop method, intptr_t UNUSED, TRAPS);
-  static int accessor_entry(methodOop method, intptr_t UNUSED, TRAPS);
-  static int empty_entry(methodOop method, intptr_t UNUSED, TRAPS);
-  static int method_handle_entry(methodOop method, intptr_t UNUSED, TRAPS);
+  static int normal_entry(Method* method, intptr_t UNUSED, TRAPS);
+  static int native_entry(Method* method, intptr_t UNUSED, TRAPS);
+  static int accessor_entry(Method* method, intptr_t UNUSED, TRAPS);
+  static int empty_entry(Method* method, intptr_t UNUSED, TRAPS);
+  static int method_handle_entry(Method* method, intptr_t UNUSED, TRAPS);
 
  public:
   // Main loop of normal_entry
@@ -53,6 +53,6 @@
 
  private:
   // Fast result type determination
-  static BasicType result_type_of(methodOop method);
+  static BasicType result_type_of(Method* method);
 
 #endif // CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP