From efb43a36d5cdab98584bd62e3ed70525981891ef Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Tue, 30 Nov 2004 09:02:13 +0000 Subject: [PATCH] 2004-11-30 Lluis Sanchez Gual * XmlCodeExporter.cs, XmlSerializer.cs, XmlSchemaImporter.cs: Fixed some compilation warnings. svn path=/trunk/mcs/; revision=36831 --- mcs/class/System.XML/System.Xml.Serialization/ChangeLog | 5 +++++ .../System.XML/System.Xml.Serialization/XmlCodeExporter.cs | 1 - .../System.XML/System.Xml.Serialization/XmlSchemaImporter.cs | 5 ++++- .../System.XML/System.Xml.Serialization/XmlSerializer.cs | 4 +--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog index 2ab023d3d68..f53aabb7b7f 100755 --- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Lluis Sanchez Gual + + * XmlCodeExporter.cs, XmlSerializer.cs, XmlSchemaImporter.cs: Fixed some + compilation warnings. + 2004-11-24 Lluis Sanchez Gual * SerializationSource.cs: Made SerializationSource abstract, and diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs index a2dbb224218..247607f6231 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs @@ -46,7 +46,6 @@ namespace System.Xml.Serialization CodeNamespace codeNamespace; CodeCompileUnit codeCompileUnit; - bool encodedFormat; #if NET_2_0 CodeGenerationOptions options; diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs index a451a90b6eb..413fcfd5305 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs @@ -52,9 +52,12 @@ namespace System.Xml.Serialization bool encodedFormat = false; XmlReflectionImporter auxXmlRefImporter; SoapReflectionImporter auxSoapRefImporter; - CodeGenerationOptions options; bool anyTypeImported; +#if NET_2_0 + CodeGenerationOptions options; +#endif + static readonly XmlQualifiedName anyType = new XmlQualifiedName ("anyType",XmlSchema.Namespace); static readonly XmlQualifiedName arrayType = new XmlQualifiedName ("Array",XmlSerializer.EncodingNamespace); static readonly XmlQualifiedName arrayTypeRefName = new XmlQualifiedName ("arrayType",XmlSerializer.EncodingNamespace); diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs index dd30cbbb8f9..bcc05dc651f 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs @@ -58,8 +58,6 @@ namespace System.Xml.Serialization XmlMapping typeMapping; SerializerData serializerData; - Type writerType; - Type readerType; static Hashtable serializerTypes = new Hashtable (); @@ -71,7 +69,7 @@ namespace System.Xml.Serialization public Type WriterType; public MethodInfo WriterMethod; public GenerationBatch Batch; - public IXmlSerializerImplementation Implementation; + public IXmlSerializerImplementation Implementation = null; public XmlSerializationReader CreateReader () { if (ReaderType != null) -- 2.25.1