Removed the Real_IsEqual() hack and renamed it to IsEqual().

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

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index b60078b4fe933a3cfebaab197e5300dd9e1af59f..a26e752cd3d38be3513104ce32af86c451e585f8 100755 (executable)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -12,9 +12,6 @@
        * pending.cs (Pending.InterfaceMethod): Call TypeManager.Real_IsEqual()
        instead of TypeManager.IsEqual().
 
-       * typemanager.cs (TypeManager.Real_IsEqual): New method; this'll
-       soon be renamed to IsEqual() and thus replace the old IsEqual().        
-
 2004-09-28  Martin Baulig  <martin@ximian.com>
 
        * generic.cs

diff --git a/mcs/gmcs/pending.cs b/mcs/gmcs/pending.cs
index 0772f7f99c03f41c17a54b56181309e07fed039d..7640d1ea71b6030ed961999c9db264481b464c60 100755 (executable)
--- a/mcs/gmcs/pending.cs
+++ b/mcs/gmcs/pending.cs
@@ -382,7 +382,7 @@ namespace Mono.CSharp {
                                        } else if ((need_proxy == null) && (name != m.Name))
                                                continue;
 
-                                       if (!TypeManager.Real_IsEqual (ret_type, m.ReturnType)){
+                                       if (!TypeManager.IsEqual (ret_type, m.ReturnType)){
                                                if (!((ret_type == null && m.ReturnType == TypeManager.void_type) ||
                                                      (m.ReturnType == null && ret_type == TypeManager.void_type)))
                                                        continue;
@@ -398,7 +398,7 @@ namespace Mono.CSharp {
                                        bool fail = false;
 
                                        for (j = 0; j < top; j++){
-                                               if (!TypeManager.Real_IsEqual (tm.args [i][j], args[j])){
+                                               if (!TypeManager.IsEqual (tm.args [i][j], args[j])){
                                                        fail = true;
                                                        break;
                                                }

diff --git a/mcs/gmcs/typemanager.cs b/mcs/gmcs/typemanager.cs
index 0052768acbb04c76cd0f2dac8f28efb11f180a2e..17f9a0abe0ff9ac86480dd8f01fadaf58d67f488 100755 (executable)
--- a/mcs/gmcs/typemanager.cs
+++ b/mcs/gmcs/typemanager.cs
@@ -1761,7 +1761,7 @@ public class TypeManager {
                return false;
        }
 
-       public static bool Real_IsEqual (Type a, Type b)
+       public static bool IsEqual (Type a, Type b)
        {
                if (a.Equals (b))
                        return true;
@@ -1817,7 +1817,7 @@ public class TypeManager {
                                return false;
 
                        for (int i = 0; i < aargs.Length; i++) {
-                               if (Real_IsEqual (aargs [i], bargs [i]))
+                               if (!IsEqual (aargs [i], bargs [i]))
                                        return false;
                        }
 
@@ -1827,14 +1827,6 @@ public class TypeManager {
                return false;
        }
 
-       public static bool IsEqual (Type a, Type b)
-       {
-               if (a.Equals (b))
-                       return true;
-               else
-                       return IsEqualGenericType (a, b);
-       }
-
        public static bool MayBecomeEqualGenericTypes (Type a, Type b)
        {
                if (a.IsGenericParameter) {