X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mcs%2Fclass%2Fcorlib%2FSystem.Reflection%2FModule.cs;h=75bfc1fc74b81ec166fe66f459e7af567465e296;hb=360f2deff8855e3e6ce62b61dcdcd9e1b097ded8;hp=a2bfae1dfbe6f031bf40c3812bd580f1be3454f1;hpb=07a220c61c833153fff9a93a8270428ce719d044;p=mono.git

diff --git a/mcs/class/corlib/System.Reflection/Module.cs b/mcs/class/corlib/System.Reflection/Module.cs
index a2bfae1dfbe..75bfc1fc74b 100644
--- a/mcs/class/corlib/System.Reflection/Module.cs
+++ b/mcs/class/corlib/System.Reflection/Module.cs
@@ -50,10 +50,8 @@ namespace System.Reflection {
 	[StructLayout (LayoutKind.Sequential)]
 #if MOBILE
 	public abstract class Module : ISerializable, ICustomAttributeProvider {
-#elif NET_4_0
-	public abstract class Module : ISerializable, ICustomAttributeProvider, _Module {
 #else
-	public partial class Module : ISerializable, ICustomAttributeProvider, _Module {
+	public abstract class Module : ISerializable, ICustomAttributeProvider, _Module {
 #endif
 		public static readonly TypeFilter FilterTypeName = new TypeFilter (filter_by_type_name);
 		public static readonly TypeFilter FilterTypeNameIgnoreCase = new TypeFilter (filter_by_type_name_ignore_case);
@@ -71,11 +69,7 @@ namespace System.Reflection {
 		const BindingFlags defaultBindingFlags = 
 			BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
 
-#if NET_4_0
 		protected
-#else
-		internal
-#endif
 		Module () {
 		}
 
@@ -128,10 +122,7 @@ namespace System.Reflection {
 		[SecurityPermission (SecurityAction.LinkDemand, SerializationFormatter = true)]
 		public virtual void GetObjectData (SerializationInfo info, StreamingContext context) 
 		{
-			if (info == null)
-				throw new ArgumentNullException ("info");
-
-			UnitySerializationHolder.GetModuleData (this, info, context);
+			throw new NotImplementedException ();
 		}
 
 		[ComVisible (true)]
@@ -222,7 +213,7 @@ namespace System.Reflection {
 		private static bool filter_by_type_name (Type m, object filterCriteria) {
 			string s = (string)filterCriteria;
 			if (s.Length > 0 && s [s.Length - 1] == '*')
-				return m.Name.StartsWith (s.Substring (0, s.Length - 1), StringComparison.Ordinal);
+				return m.Name.StartsWithOrdinalUnchecked (s.Substring (0, s.Length - 1));
 			
 			return m.Name == s;
 		}
@@ -232,7 +223,7 @@ namespace System.Reflection {
 			if (s.Length > 0 && s [s.Length - 1] == '*')
 				return m.Name.StartsWith (s.Substring (0, s.Length - 1), StringComparison.OrdinalIgnoreCase);
 			
-			return String.Equals (m.Name, s, StringComparison.OrdinalIgnoreCase);
+			return string.Compare (m.Name, s, StringComparison.OrdinalIgnoreCase) == 0;
 		}
 
 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
@@ -288,7 +279,6 @@ namespace System.Reflection {
 		}
 #endif
 
-#if NET_4_0
 		public override bool Equals (object o)
 		{
 			return o == (object) this;
@@ -317,9 +307,7 @@ namespace System.Reflection {
 			return !left.Equals (right);
 		}
 
-#endif
 
-#if NET_4_0
 
 		public virtual Assembly Assembly {
 			get { throw CreateNIE (); }
@@ -454,7 +442,9 @@ namespace System.Reflection {
 		{
 			throw CreateNIE ();
 		}
-#endif
 
+		public virtual IEnumerable<CustomAttributeData> CustomAttributes {
+			get { return GetCustomAttributesData (); }
+		}
 	}
 }