re-enable ResolveEntity in XmlReader and derived classes

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

diff --git a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
index ea37b4ed6f049b2940a1d8691715af754dcaa05c..e476b9565706e3c840f632e8c0d16f33f6442dea 100644 (file)
--- a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
+++ b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs
@@ -116,9 +116,11 @@ namespace Mono.Xml
                        get { return source.EOF; }
                }
 
+#if !NET_2_1
                public override bool HasValue {
                        get { return Current.HasValue; }
                }
+#endif
 
                public override bool IsDefault {
                        get { return Current.IsDefault; }
@@ -397,6 +399,7 @@ namespace Mono.Xml
                        }
                }
 
+#if !NET_2_1
                public override bool ReadAttributeValue ()
                {
                        if (entity != null && entity_inside_attr) {
@@ -411,13 +414,15 @@ namespace Mono.Xml
                        }
                        return Current.ReadAttributeValue ();
                }
+#endif
 
                public override string ReadString ()
                {
                        return base.ReadString ();
                }
 
-               public override void ResolveEntity ()
+               public override
+               void ResolveEntity ()
                {
 #if NET_2_0
                        DoResolveEntity ();