2005-02-11 Marek Safar <marek.safar@seznam.cz>

	* mono-api-diff.cs : Fixed collision in the sealed/static detection.

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

diff --git a/mcs/tools/corcompare/ChangeLog b/mcs/tools/corcompare/ChangeLog
index 5d07eac43b160b21089f4293ab6570f85f42dbd0..14aa2db278055235d93dcebec68352fc1dd88ada 100644 (file)
--- a/mcs/tools/corcompare/ChangeLog
+++ b/mcs/tools/corcompare/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-11  Marek Safar <marek.safar@seznam.cz>
+
+       * mono-api-diff.cs : Fixed collision in the sealed/static detection.\r
+
 2005-02-10  Marek Safar <marek.safar@seznam.cz>
 
        * mono-api-diff.cs ,

diff --git a/mcs/tools/corcompare/mono-api-diff.cs b/mcs/tools/corcompare/mono-api-diff.cs
index d60b8dcf9ce2bbd4bd4c628eaff67ab5b8db93a0..f3550f8c591360afc81fe95233795c443ef707b4 100644 (file)
--- a/mcs/tools/corcompare/mono-api-diff.cs
+++ b/mcs/tools/corcompare/mono-api-diff.cs
@@ -750,7 +750,7 @@ namespace Mono.AssemblyCompare
                                AddWarning (parent, "Base class is wrong: {0} != {1}", baseName, oclass.baseName);
 
                        if (isAbstract != oclass.isAbstract || isSealed != oclass.isSealed) {
-                               if ((isAbstract && isSealed) || (!oclass.isAbstract && !oclass.isSealed))
+                               if ((isAbstract && isSealed) || (isAbstract && isSealed && !oclass.isAbstract && !oclass.isSealed))
                                        AddWarning (parent, "Should {0}be static", isAbstract ? "" : "not ");
                                else if (isAbstract != oclass.isAbstract)
                                        AddWarning (parent, "Should {0}be abstract", isAbstract ? "" : "not ");