diff options
author | jfrijters <jfrijters> | 2010-05-20 08:26:35 +0400 |
---|---|---|
committer | jfrijters <jfrijters> | 2010-05-20 08:26:35 +0400 |
commit | b10537509927a4fec99085e73d17641a7323e095 (patch) | |
tree | c8c778cfe973cc2b58c5730752371206fe63e817 /ikvmc | |
parent | ef1cad08809572ece0a94e1215eeac08bd0c72c9 (diff) |
Fixed regression introduced when ikvm.runtime.Startup.setProperties() signature was changed. It should also be changed here. Also changed to using Dictionary<string, string> instead of Hashtable.
Diffstat (limited to 'ikvmc')
-rw-r--r-- | ikvmc/CompilerClassLoader.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ikvmc/CompilerClassLoader.cs b/ikvmc/CompilerClassLoader.cs index 9a1cb51c..14228f4f 100644 --- a/ikvmc/CompilerClassLoader.cs +++ b/ikvmc/CompilerClassLoader.cs @@ -456,15 +456,15 @@ namespace IKVM.Internal TypeWrapper startupType = LoadClassByDottedName("ikvm.runtime.Startup"); if(props.Count > 0) { - ilgen.Emit(OpCodes.Newobj, JVM.Import(typeof(System.Collections.Hashtable)).GetConstructor(Type.EmptyTypes)); + ilgen.Emit(OpCodes.Newobj, JVM.Import(typeof(System.Collections.Generic.Dictionary<string, string>)).GetConstructor(Type.EmptyTypes)); foreach(KeyValuePair<string, string> kv in props) { ilgen.Emit(OpCodes.Dup); ilgen.Emit(OpCodes.Ldstr, kv.Key); ilgen.Emit(OpCodes.Ldstr, kv.Value); - ilgen.Emit(OpCodes.Callvirt, JVM.Import(typeof(System.Collections.Hashtable)).GetMethod("Add")); + ilgen.Emit(OpCodes.Callvirt, JVM.Import(typeof(System.Collections.Generic.Dictionary<string, string>)).GetMethod("Add")); } - startupType.GetMethodWrapper("setProperties", "(Lcli.System.Collections.Hashtable;)V", false).EmitCall(ilgen); + startupType.GetMethodWrapper("setProperties", "(Lcli.System.Collections.IDictionary;)V", false).EmitCall(ilgen); } ilgen.BeginExceptionBlock(); startupType.GetMethodWrapper("enterMainThread", "()V", false).EmitCall(ilgen); |