Forget to commit
authorMarek Safar <marek.safar@gmail.com>
Fri, 23 Oct 2009 07:46:54 +0000 (07:46 -0000)
committerMarek Safar <marek.safar@gmail.com>
Fri, 23 Oct 2009 07:46:54 +0000 (07:46 -0000)
svn path=/trunk/mcs/; revision=144720

mcs/mcs/assign.cs
mcs/mcs/nullable.cs

index 1a9bd2620e8814a936a1b43c5cc3b8000cb10199..47eee6873d44a14d18e77db53f2637fdf4e13193 100644 (file)
@@ -500,7 +500,7 @@ namespace Mono.CSharp {
                        if (resolved == null) {
                                //
                                // Field initializers are tricky for partial classes. They have to
-                               // share same costructor (block) but they have they own resolve scope.
+                               // share same constructor (block) but they have they own resolve scope.
                                //
 
                                IMemberContext old = ec.MemberContext;
index 3d8a7ec5280236bb5a9b2c332adfe0ff8ae416ec..f84d7ee73bda657f80420f71883809d35c2ddf6c 100644 (file)
@@ -74,7 +74,7 @@ namespace Mono.CSharp.Nullable
                        Value = value_pi.GetGetMethod (false);
 
                        // When compiling corlib
-                       if (type.Module == RootContext.ToplevelTypes.Builder) {
+                       if (TypeManager.IsBeingCompiled (type)) {
                                TypeContainer tc = TypeManager.LookupGenericTypeContainer (type);
                                
                                // TODO: check for correct overload
@@ -85,7 +85,7 @@ namespace Mono.CSharp.Nullable
                        }
 
 #if MS_COMPATIBLE
-                       if (UnderlyingType.Module == RootContext.ToplevelTypes.Builder) {
+                       if (TypeManager.IsBeingCompiled (UnderlyingType)) {
                                ConstructorInfo cinfo = TypeManager.DropGenericTypeArguments (type).GetConstructors ()[0];
                                Constructor = TypeBuilder.GetConstructor (type, cinfo);
                                return;