diff options
| author | Geoff Norton <grompf@sublimeintervention.com> | 2010-02-20 23:25:37 +0300 |
|---|---|---|
| committer | Geoff Norton <grompf@sublimeintervention.com> | 2010-02-20 23:25:37 +0300 |
| commit | 8d88e99d6518017412f623f98e720cd5afb1c118 (patch) | |
| tree | a25929ec17d440eda1efa7d46c9d4dbbb1edce89 /mcs/class/System.XML/System.Xml | |
| parent | 6e191b6bdc838e9fc6ea972372ea350bada807b1 (diff) | |
2010-02-20 Geoff Norton <gnorton@novell.com>
* XmlInputStream.cs: Disable this codepath on monotouch. Fixes
#562155
svn path=/branches/mono-2-6/mcs/; revision=152142
Diffstat (limited to 'mcs/class/System.XML/System.Xml')
| -rw-r--r-- | mcs/class/System.XML/System.Xml/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlInputStream.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index dc695527600..0cf6d9c1010 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,8 @@ +2010-02-20 Geoff Norton <gnorton@novell.com> + + * XmlInputStream.cs: Disable this codepath on monotouch. Fixes + #562155 + 2010-01-25 Atsushi Enomoto <atsushi@ximian.com> * XmlConvert.cs : convert TimeSpan.MinValue to correct string. diff --git a/mcs/class/System.XML/System.Xml/XmlInputStream.cs b/mcs/class/System.XML/System.Xml/XmlInputStream.cs index 7ada6eb919d..75a3f806b98 100644 --- a/mcs/class/System.XML/System.Xml/XmlInputStream.cs +++ b/mcs/class/System.XML/System.Xml/XmlInputStream.cs @@ -361,7 +361,7 @@ namespace System.Xml static string GetStringFromBytes (byte [] bytes, int index, int count) { -#if NET_2_1 +#if NET_2_1 && !MONOTOUCH char [] chars = new char [count]; for (int i = index; i < count; i++) chars [i] = (char) bytes [i]; |