diff options
| author | Geoff Norton <grompf@sublimeintervention.com> | 2009-02-19 08:15:28 +0300 |
|---|---|---|
| committer | Geoff Norton <grompf@sublimeintervention.com> | 2009-02-19 08:15:28 +0300 |
| commit | b1c69b43b5abf5e95257dcb833cf883a2f85e3d3 (patch) | |
| tree | 90a8202a9a8580f1f1cf501c60b4bae5c2ee01a2 /mcs/class/System.XML/System.Xml | |
| parent | 4a2ab5827d8811e257934d9b8735d147a144e9e0 (diff) | |
2009-02-19 Geoff Norton <gnorton@novell.com>
* *.cs: The tuner takes care of the visibility of this for us, and it
is in fact needed. (Readd ReadAttributeValue to 2.1)
svn path=/trunk/mcs/; revision=127366
Diffstat (limited to 'mcs/class/System.XML/System.Xml')
6 files changed, 0 insertions, 12 deletions
diff --git a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs index 17ad25ca08d..315adf04c49 100644 --- a/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs +++ b/mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs @@ -403,7 +403,6 @@ namespace Mono.Xml } } -#if !NET_2_1 public override bool ReadAttributeValue () { if (entity != null && entity_inside_attr) { @@ -418,7 +417,6 @@ namespace Mono.Xml } return Current.ReadAttributeValue (); } -#endif public override string ReadString () { diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs b/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs index dba08f48760..16acba0c383 100644 --- a/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs +++ b/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs @@ -360,7 +360,6 @@ namespace System.Xml return source.Read (); } -#if !NET_2_1 public override bool ReadAttributeValue () { if (entity != null && entityInsideAttribute) { @@ -373,7 +372,6 @@ namespace System.Xml } return Current.ReadAttributeValue (); } -#endif #if NET_2_0 public override int ReadContentAsBase64 ( diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs b/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs index 9cba6031a32..dc71ed7d537 100644 --- a/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs +++ b/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs @@ -789,7 +789,6 @@ namespace System.Xml } } -#if !NET_2_1 public override bool ReadAttributeValue () { if (current.NodeType == XmlNodeType.Attribute) { @@ -805,7 +804,6 @@ namespace System.Xml } else return false; } -#endif public override string ReadString () { diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs index 40c6e05d9b8..5c6ae610306 100644 --- a/mcs/class/System.XML/System.Xml/XmlReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlReader.cs @@ -563,9 +563,7 @@ namespace System.Xml public abstract bool Read (); -#if !NET_2_1 public abstract bool ReadAttributeValue (); -#endif public virtual string ReadElementString () { diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs index a90afbd6c8f..f80ef81c2f6 100644 --- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs @@ -617,7 +617,6 @@ namespace System.Xml return more; } -#if !NET_2_1 public override bool ReadAttributeValue () { if (readState == ReadState.Initial && startNodeType == XmlNodeType.Attribute) { @@ -638,7 +637,6 @@ namespace System.Xml else return false; } -#endif public int ReadBase64 (byte [] buffer, int offset, int length) { diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs index aca100fa5c4..b2e3c07da6f 100644 --- a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs +++ b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs @@ -574,7 +574,6 @@ namespace System.Xml } } -#if !NET_2_1 public override bool ReadAttributeValue () { if (entity != null && entityInsideAttribute) { @@ -587,7 +586,6 @@ namespace System.Xml } return Current.ReadAttributeValue (); } -#endif public override string ReadString () { |