hack SettingValueElement.Unmerge().

[mono.git] / mcs / class / System.XML / System.Xml.XPath / XPathComparer.cs

diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathComparer.cs b/mcs/class/System.XML/System.Xml.XPath/XPathComparer.cs
index 1fd8b0c10b09e4dc6aba7fef3682b6c0f2cccf06..91d60ed2c698750262d3997e60c66289d73b4fd6 100644 (file)
--- a/mcs/class/System.XML/System.Xml.XPath/XPathComparer.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathComparer.cs
@@ -45,8 +45,8 @@ namespace System.Xml.XPath
 
                public int Compare (object o1, object o2)
                {
-                       BaseIterator nav1 = o1 as BaseIterator;
-                       BaseIterator nav2 = o2 as BaseIterator;
+                       XPathNodeIterator nav1 = o1 as XPathNodeIterator;
+                       XPathNodeIterator nav2 = o2 as XPathNodeIterator;
                        if (nav1 == null)
                                return -1;
                        if (nav2 == null)
@@ -92,17 +92,14 @@ namespace System.Xml.XPath
                }
 
 #if NET_2_0
-               public bool Equals (object o1, object o2)
+               bool IEqualityComparer.Equals (object o1, object o2)
                {
                        XPathNavigator nav1 = o1 as XPathNavigator;
                        XPathNavigator nav2 = o2 as XPathNavigator;
-                       if (nav1 != null && nav2 != null)
-                               return nav1.IsSamePosition (nav2);
-                       else
-                               return false;
+                       return nav1 != null && nav2 != null && nav1.IsSamePosition (nav2);
                }
 
-               public int GetHashCode (object obj)
+               int IEqualityComparer.GetHashCode (object obj)
                {
                        return obj.GetHashCode ();
                }