diff options
| author | Jb Evain <jbevain@gmail.com> | 2008-08-19 20:26:20 +0400 |
|---|---|---|
| committer | Jb Evain <jbevain@gmail.com> | 2008-08-19 20:26:20 +0400 |
| commit | 24fddc33da65dcbd97159c4dad5417e2063e1415 (patch) | |
| tree | 87b3ee2bb02af00dc3bb30e049d5d8981faad1ec /mcs/class/System.XML/System.Xml.Serialization | |
| parent | a10d8c3e0037bec723d47dcc93d44ad937579b24 (diff) | |
sl2b2 update
svn path=/trunk/mcs/; revision=110955
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Serialization')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/XmlRootAttribute.cs | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog index e985baadde5..5179cde0866 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog @@ -1,3 +1,7 @@ +2008-08-19 Jb Evain <jbevain@novell.com> + + * XmlRootAttribute.cs: ifdef out parts to compile on net_2_1. + 2008-07-10 Atsushi Enomoto <atsushi@ximian.com> * XmlSerializationWriter.cs : more helpful error message. diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlRootAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlRootAttribute.cs index 14001c4f3a5..f56378f3813 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlRootAttribute.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlRootAttribute.cs @@ -83,7 +83,7 @@ namespace System.Xml.Serialization get { return ns; } set { ns = value; } } - +#if !NET_2_1 internal void AddKeyHash (System.Text.StringBuilder sb) { sb.Append ("XRA "); @@ -93,5 +93,6 @@ namespace System.Xml.Serialization KeyHelper.AddField (sb, 4, isNullable); sb.Append ('|'); } +#endif } } |