2010-06-22 Jb Evain <jbevain@novell.com>

	* ModuleBuilder.cs
	* AssemblyBuilder.cs:
		properly override the new net_4_0 methods in moonlight.

svn path=/trunk/mcs/; revision=159312

diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
index 903c779b11d802570e17cb5516f07ac5ed186086..082fd30eb2d150d9b3f9a6601731b21f3f89a496 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -1200,7 +1200,7 @@ namespace System.Reflection.Emit
                        throw new NotImplementedException ();
                }
 
-#if NET_4_0
+#if NET_4_0 || MOONLIGHT
                public override Type GetType (string name, bool throwOnError, bool ignoreCase)
                {
                        if (name == null)

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index a56d99af94d6da8ae3d1aef613c0d4abf0f3d134..45248a8b9c9d64780305e4889e69523825a5c1ed 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-22  Jb Evain  <jbevain@novell.com>
+
+       * ModuleBuilder.cs
+       * AssemblyBuilder.cs:
+               properly override the new net_4_0 methods in moonlight.
+
 2010-05-27  Jb Evain  <jbevain@novell.com>
 
        * EnumBuilder.cs (GetEnumUnderlyingType): override.

diff --git a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
index 8033613647b05c858e120c66f8bd54dd4bde8741..3ae338b9ffa5bba11eff59406d840b26d81d4b93 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
@@ -821,7 +821,7 @@ namespace System.Reflection.Emit {
                        throw new NotImplementedException ();
                }
 
-#if NET_4_0
+#if NET_4_0 || MOONLIGHT
                public override Assembly Assembly {
                        get { return assemblyb; }
                }