diff options
author | Atsushi Eno <atsushieno@gmail.com> | 2008-07-09 14:52:10 +0400 |
---|---|---|
committer | Atsushi Eno <atsushieno@gmail.com> | 2008-07-09 14:52:10 +0400 |
commit | 92573b4266365f8b722f0cd86c827eccbe3c00a4 (patch) | |
tree | d4bd3f951d2e56e59b01ff6612c8a691b4172527 /mcs/class/System.XML/System.Xml.Serialization | |
parent | fdc1cfb1a3956ef1337748d1e5be48776d7b3469 (diff) |
2008-07-09 Atsushi Enomoto <atsushi@ximian.com>
* MapCodeGenerator.cs : use explicit element name for explicitly added
XmlElementAttribute. (exposed by some product from some company.)
svn path=/trunk/mcs/; revision=107530
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Serialization')
-rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/ChangeLog | 5 | ||||
-rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs | 2 |
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 39ffa0ed8e9..89a199f708d 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog @@ -1,3 +1,8 @@ +2008-07-09 Atsushi Enomoto <atsushi@ximian.com> + + * MapCodeGenerator.cs : use explicit element name for explicitly added + XmlElementAttribute. (exposed by some product from some company.) + 2008-06-05 Atsushi Enomoto <atsushi@ximian.com> * XmlSerializationReaderInterpreter.cs, MapCodeGenerator.cs, diff --git a/mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs b/mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs index 1295c3bdc38..2e83d3b1ea1 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs @@ -389,7 +389,7 @@ namespace System.Xml.Serialization { if (ExportExtraElementAttributes (attributes, einfo, defaultNamespace, defaultType)) continue; - GenerateElementInfoMember (attributes, member, einfo, defaultType, defaultNamespace, addAlwaysAttr, forceUseMemberName); + GenerateElementInfoMember (attributes, member, einfo, defaultType, defaultNamespace, addAlwaysAttr, forceUseMemberName | addAlwaysAttr); } GenerateElementMember (attributes, member); |