diff src/share/vm/runtime/javaCalls.cpp @ 2182:9569fdf936ff

Made merge compile.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Wed, 16 Feb 2011 14:21:52 +0100
parents d25d4ca69222
children 0654ee04b214
line wrap: on
line diff
--- a/src/share/vm/runtime/javaCalls.cpp	Wed Feb 16 13:47:20 2011 +0100
+++ b/src/share/vm/runtime/javaCalls.cpp	Wed Feb 16 14:21:52 2011 +0100
@@ -201,7 +201,7 @@
 
 // ============ Interface calls ============
 
-void JavaCalls::call_interface(JavaValue* result, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS) {
+void JavaCalls::call_interface(JavaValue* result, KlassHandle spec_klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) {
   CallInfo callinfo;
   Handle receiver = args->receiver();
   KlassHandle recvrKlass(THREAD, receiver.is_null() ? (klassOop)NULL : receiver->klass());