2006-06-22 Marek Sieradzki <marek.sieradzki@gmail.com>

[mono.git] / mcs / tools / corcompare / MissingType.cs

diff --git a/mcs/tools/corcompare/MissingType.cs b/mcs/tools/corcompare/MissingType.cs
index 6c158527bfbd0ab3c04e3c9436627930a3706b4b..82a58033129b012e538c36c8a939486cf67c5f8a 100644 (file)
--- a/mcs/tools/corcompare/MissingType.cs
+++ b/mcs/tools/corcompare/MissingType.cs
@@ -51,7 +51,13 @@ namespace Mono.Util.CorCompare
 
                public override string Name 
                {
-                       get { return TypeInfoBest.Name; }
+                       get
+                       {
+                               Type type = TypeInfoBest;
+                               if (type.DeclaringType != null)
+                                       return type.DeclaringType.Name + "+" + type.Name;
+                               return type.Name;
+                       }
                }
 
                public override string Type
@@ -413,7 +419,7 @@ namespace Mono.Util.CorCompare
                                }
 
                                // serializable attribute
-                               AddFakeAttribute (typeMono.IsSerializable, typeMS.IsSerializable, "System.SerializableAttribute");
+                               // AddFakeAttribute (typeMono.IsSerializable, typeMS.IsSerializable, "System.SerializableAttribute");
                                AddFakeAttribute (typeMono.IsAutoLayout, typeMS.IsAutoLayout, "System.AutoLayoutAttribute");
                                AddFakeAttribute (typeMono.IsExplicitLayout, typeMS.IsExplicitLayout, "System.ExplicitLayoutAttribute");
                                AddFakeAttribute (typeMono.IsLayoutSequential, typeMS.IsLayoutSequential, "System.SequentialLayoutAttribute");
@@ -451,7 +457,7 @@ namespace Mono.Util.CorCompare
                                case MemberTypes.Field:
                                        return !((FieldInfo) mi).IsPrivate && !((FieldInfo) mi).IsFamilyAndAssembly && !((FieldInfo) mi).IsAssembly;
                                case MemberTypes.NestedType:
-                                       return !((Type) mi).IsNestedPrivate;
+                                       return !((Type) mi).IsNestedPrivate && !((Type) mi).IsNestedAssembly && !((Type) mi).IsNestedFamANDAssem;
                                case MemberTypes.Property:      // great, now we have to look at the methods
                                        PropertyInfo pi = (PropertyInfo) mi;
                                        MethodInfo miAccessor = pi.GetGetMethod ();