Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/ikvm-fork.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjfrijters <jfrijters>2010-05-10 12:24:35 +0400
committerjfrijters <jfrijters>2010-05-10 12:24:35 +0400
commita56fb0a1d3d7fc063bbfb73b94a120ef12a75215 (patch)
treeb70fa84ae4dadc270de703769501bf3c36ab15b7 /reflect/TypeNameParser.cs
parent87e5eff41c4164c1de1fc267ce66eaba8d87fbb6 (diff)
Made mscorlib handling more explicit (and simpler) and fixed Import() to not load assemblies directly, but go through the resolve event.
Diffstat (limited to 'reflect/TypeNameParser.cs')
-rw-r--r--reflect/TypeNameParser.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/reflect/TypeNameParser.cs b/reflect/TypeNameParser.cs
index 21331733..d6c18ee9 100644
--- a/reflect/TypeNameParser.cs
+++ b/reflect/TypeNameParser.cs
@@ -380,14 +380,14 @@ namespace IKVM.Reflection
}
else if (context == null)
{
- type = universe.System_Object.Assembly.GetTypeImpl(name);
+ type = universe.Mscorlib.GetTypeImpl(name);
}
else
{
type = context.GetTypeImpl(name);
- if (type == null && context != universe.System_Object.Assembly)
+ if (type == null && context != universe.Mscorlib)
{
- type = universe.System_Object.Assembly.GetTypeImpl(name);
+ type = universe.Mscorlib.GetTypeImpl(name);
}
}
return Expand(type, context, throwOnError, originalName);