diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-12-13 13:16:42 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-12-13 13:16:42 +0300 |
| commit | 431580c4bcac9a5fc562594ec458c04eee0fb4aa (patch) | |
| tree | 1475fb35e769f5f4102d1a5433729ed36a20dc50 /mcs/class/System.XML | |
| parent | 86cd30f3b752eb49cfee32092943f4b03d776f04 (diff) | |
2005-12-13 Atsushi Enomoto <atsushi@ximian.com>
* XmlTextReader.cs : 1.x build fix.
svn path=/trunk/mcs/; revision=54274
Diffstat (limited to 'mcs/class/System.XML')
| -rw-r--r-- | mcs/class/System.XML/System.Xml/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlTextReader.cs | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index 2920bc0bdb2..6e6c935dc66 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,5 +1,9 @@ 2005-12-13 Atsushi Enomoto <atsushi@ximian.com> + * XmlTextReader.cs : 1.x build fix. + +2005-12-13 Atsushi Enomoto <atsushi@ximian.com> + * XmlTextReader.cs : when XmlReader.Create() creates this instance, don't expect strict text declaration. Check SkipTextDeclaration() on Read(). diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs index faf1f35f767..dc04ba5ad8c 100644 --- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs @@ -2083,11 +2083,13 @@ namespace System.Xml } // Encoding value should be checked inside XmlInputStream. } +#if NET_2_0 // this condition is to check if this instance is // not created by XmlReader.Create() (which just // omits strict text declaration check). else if (Conformance == ConformanceLevel.Auto) throw NotWFError ("Encoding declaration is mandatory in text declaration."); +#endif Expect ("?>"); } |