X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Reflection%2FMonoAssembly.cs;h=fedff328ce7dd41801dbe977817df96c9a7b81fe;hb=bf2e5e58df2a6525126ad3a880c2c21bb890e10d;hp=b861da70e00c7ec541394c814b7e50dc310ef39a;hpb=8bb9b4409d3f73fdf5ec2afc3b9add6bd33f712f;p=mono.git

diff --git a/mcs/class/corlib/System.Reflection/MonoAssembly.cs b/mcs/class/corlib/System.Reflection/MonoAssembly.cs
index b861da70e00..fedff328ce7 100644
--- a/mcs/class/corlib/System.Reflection/MonoAssembly.cs
+++ b/mcs/class/corlib/System.Reflection/MonoAssembly.cs
@@ -37,7 +37,7 @@ using System.Collections.Generic;
 
 namespace System.Reflection {
 
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 	[ComVisible (true)]
 	[ComDefaultInterfaceAttribute (typeof (_Assembly))]
 	[Serializable]
@@ -47,7 +47,7 @@ namespace System.Reflection {
 	public partial class Assembly {
 #endif
 		public
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 		override
 #endif
 		Type GetType (string name, bool throwOnError, bool ignoreCase)
@@ -59,7 +59,7 @@ namespace System.Reflection {
 			throw new ArgumentException ("name", "Name cannot be empty");
 
 			res = InternalGetType (null, name, throwOnError, ignoreCase);
-#if !(NET_4_0 || MOONLIGHT || MOBILE) && !FULL_AOT_RUNTIME
+#if !NET_4_0 && !FULL_AOT_RUNTIME
 			if (res is TypeBuilder) {
 				if (throwOnError)
 					throw new TypeLoadException (string.Format ("Could not load type '{0}' from assembly '{1}'", name, this));
@@ -70,7 +70,7 @@ namespace System.Reflection {
 		}
 
 		public
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 		override
 #endif
 		Module GetModule (String name)
@@ -90,7 +90,7 @@ namespace System.Reflection {
 		}
 
 		public
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 		override
 #endif
 		AssemblyName[] GetReferencedAssemblies () {
@@ -98,7 +98,7 @@ namespace System.Reflection {
 		}
 
 		public
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 		override
 #endif
 		Module[] GetModules (bool getResourceModules) {
@@ -117,7 +117,7 @@ namespace System.Reflection {
 
 		[MonoTODO ("Always returns the same as GetModules")]
 		public
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 		override
 #endif
 		Module[] GetLoadedModules (bool getResourceModules)
@@ -126,7 +126,7 @@ namespace System.Reflection {
 		}
 
 		public
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 		override
 #endif
 		Assembly GetSatelliteAssembly (CultureInfo culture)
@@ -135,7 +135,7 @@ namespace System.Reflection {
 		}
 
 		public
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 		override
 #endif
 		Assembly GetSatelliteAssembly (CultureInfo culture, Version version)
@@ -146,7 +146,7 @@ namespace System.Reflection {
 		//FIXME remove GetManifestModule under v4, it's a v2 artifact
 		[ComVisible (false)]
 		public
-#if NET_4_0 || MOONLIGHT || MOBILE
+#if NET_4_0
 		override
 #endif
 		Module ManifestModule {
@@ -155,7 +155,6 @@ namespace System.Reflection {
 			}
 		}
 
-#if !MOONLIGHT
 		public
 #if NET_4_0
 		override
@@ -165,8 +164,6 @@ namespace System.Reflection {
 				return get_global_assembly_cache ();
 			}
 		}
-#endif
-
 	}
 }