mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
View File

@@ -109,10 +109,8 @@ namespace System.Xml.Serialization {
return ImportMembersMapping (elementName, ns, members, hasWrapperElement, true);
}
#if NET_2_0
[MonoTODO]
public
#endif
XmlMembersMapping ImportMembersMapping (string elementName,
string ns,
XmlReflectionMember[] members,
@@ -122,10 +120,8 @@ namespace System.Xml.Serialization {
return ImportMembersMapping (elementName, ns, members, hasWrapperElement, rpc, true);
}
#if NET_2_0
[MonoTODO]
public
#endif
XmlMembersMapping ImportMembersMapping (string elementName,
string ns,
XmlReflectionMember[] members,
@@ -136,10 +132,8 @@ namespace System.Xml.Serialization {
return ImportMembersMapping (elementName, ns, members, hasWrapperElement, rpc, openModel, XmlMappingAccess.Read | XmlMappingAccess.Write);
}
#if NET_2_0
[MonoTODO] // FIXME: handle writeAccessors, validate, and mapping access
public
#endif
XmlMembersMapping ImportMembersMapping (string elementName,
string ns,
XmlReflectionMember[] members,
@@ -227,10 +221,8 @@ namespace System.Xml.Serialization {
default: throw new NotSupportedException ("Type " + typeData.Type.FullName + " not supported for XML stialization");
}
#if NET_2_0
// bug #372780
map.SetKey (typeData.Type.ToString ());
#endif
map.RelatedMaps = relatedMaps;
map.Format = SerializationFormat.Literal;
Type[] extraTypes = includedTypes != null ? (Type[]) includedTypes.ToArray (typeof (Type)) : null;
@@ -1094,10 +1086,6 @@ namespace System.Xml.Serialization {
bool CanBeNull (TypeData type)
{
#if !NET_2_0 // idiotic compatibility
if (type.Type == typeof (XmlQualifiedName))
return false;
#endif
return !type.Type.IsValueType || type.IsNullable;
}