Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJb Evain <jbevain@gmail.com>2009-08-25 14:18:20 +0400
committerJb Evain <jbevain@gmail.com>2009-08-25 14:18:20 +0400
commit561bf6b6b234c3645c26a8bbe7d2d2addbb3957f (patch)
tree4b380e8add0ed77fe22f3bc1b49a50c436e89b4b /mcs/class/System.XML/System.Xml.Serialization
parentbbe7b2313f70b1073cf21564c71e182407dfa7aa (diff)
bring a net_2_0 feature set to monotouch
svn path=/trunk/mcs/; revision=140606
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Serialization')
-rw-r--r--mcs/class/System.XML/System.Xml.Serialization/SerializationSource.cs2
-rw-r--r--mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs2
-rw-r--r--mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs6
-rw-r--r--mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs11
4 files changed, 11 insertions, 10 deletions
diff --git a/mcs/class/System.XML/System.Xml.Serialization/SerializationSource.cs b/mcs/class/System.XML/System.Xml.Serialization/SerializationSource.cs
index 0816f42cfc2..9df5c844067 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/SerializationSource.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/SerializationSource.cs
@@ -34,7 +34,7 @@ using System.Text;
namespace System.Xml.Serialization
{
-#if !NET_2_1
+#if !NET_2_1 || MONOTOUCH
internal abstract class SerializationSource
{
Type[] includedTypes;
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
index 3d405288c51..9bdea9d9edf 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
@@ -127,7 +127,7 @@ namespace System.Xml.Serialization
{
get { return _mapMember.Name; }
}
-#if !TARGET_JVM
+#if !TARGET_JVM && !MONOTOUCH
public string GenerateTypeName (System.CodeDom.Compiler.CodeDomProvider codeProvider)
{
string ret = codeProvider.CreateValidIdentifier (_mapMember.TypeData.FullTypeName);
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
index 6ee4e787e8c..91e8fac3481 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
@@ -30,7 +30,7 @@
//
using System.Xml;
-#if !TARGET_JVM
+#if !TARGET_JVM && !MONOTOUCH
using System.CodeDom.Compiler;
#endif
using System.Xml.Schema;
@@ -43,7 +43,7 @@ using System.Xml.Serialization.Configuration;
namespace System.Xml.Serialization
{
public class XmlSchemaImporter
-#if NET_2_0
+#if NET_2_0 && !MONOTOUCH
: SchemaImporter
#endif
{
@@ -100,7 +100,7 @@ namespace System.Xml.Serialization
}
#if NET_2_0
-#if !TARGET_JVM
+#if !TARGET_JVM && !MONOTOUCH
[MonoTODO]
public XmlSchemaImporter (XmlSchemas schemas, CodeGenerationOptions options, CodeDomProvider codeProvider, ImportContext context)
{
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
index 78ea707b046..380774f4be2 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
@@ -37,7 +37,7 @@ using System.Reflection;
using System.Xml;
using System.Xml.Schema;
using System.Text;
-#if !TARGET_JVM
+#if !TARGET_JVM && !MONOTOUCH
using System.CodeDom;
using System.CodeDom.Compiler;
using Microsoft.CSharp;
@@ -120,7 +120,7 @@ namespace System.Xml.Serialization
// debugging pourposes by adding the "nofallback" option.
// For example: MONO_XMLSERIALIZER_THS=0,nofallback
-#if TARGET_JVM
+#if TARGET_JVM || MONOTOUCH
string db = null;
string th = null;
generationThreshold = -1;
@@ -150,7 +150,7 @@ namespace System.Xml.Serialization
}
#endif
deleteTempFiles = (db == null || db == "no");
-
+#if !MONOTOUCH
IDictionary table = (IDictionary) ConfigurationSettings.GetConfig("system.diagnostics");
if (table != null)
{
@@ -161,6 +161,7 @@ namespace System.Xml.Serialization
if (val == "1") deleteTempFiles = false;
}
}
+#endif
}
#region Constructors
@@ -512,7 +513,7 @@ namespace System.Xml.Serialization
throw new NotImplementedException ();
}
-#if !TARGET_JVM
+#if !TARGET_JVM && !MONOTOUCH
public static Assembly GenerateSerializer (Type[] types, XmlMapping[] mappings)
{
return GenerateSerializer (types, mappings, null);
@@ -618,7 +619,7 @@ namespace System.Xml.Serialization
return new XmlSerializationReaderInterpreter (typeMapping);
}
-#if TARGET_JVM
+#if TARGET_JVM || MONOTOUCH
void CheckGeneratedTypes (XmlMapping typeMapping)
{
throw new NotImplementedException();