2004-11-30 Lluis Sanchez Gual <lluis@novell.com>

	* XmlCodeExporter.cs, XmlSerializer.cs, XmlSchemaImporter.cs: Fixed some
	compilation warnings.

svn path=/trunk/mcs/; revision=36831

diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
index 2ab023d3d680c4f09cce32579bd4330f2f05547a..f53aabb7b7fac7ec3574afa81c851a3d163ad246 100755 (executable)
--- 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  <lluis@novell.com>
+
+       * XmlCodeExporter.cs, XmlSerializer.cs, XmlSchemaImporter.cs: Fixed some
+       compilation warnings.
+
 2004-11-24  Lluis Sanchez Gual  <lluis@novell.com>
 
        * 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 a2dbb2242182a82e367338900365df00a6fcf3dd..247607f6231483c081e114905046a41fd62a1fb7 100644 (file)
--- 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
 \r
                CodeNamespace codeNamespace;\r
                CodeCompileUnit codeCompileUnit;\r
-               bool encodedFormat;\r
 \r
 #if NET_2_0\r
                CodeGenerationOptions options;\r

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
index a451a90b6eb5e8014e593e6ae0ef2888801ba072..413fcfd5305f8bea5cb2ff199f47055c53298dfb 100644 (file)
--- 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;\r
                XmlReflectionImporter auxXmlRefImporter;\r
                SoapReflectionImporter auxSoapRefImporter;\r
-               CodeGenerationOptions options;\r
                bool anyTypeImported;\r
 \r
+#if NET_2_0\r
+               CodeGenerationOptions options;\r
+#endif\r
+\r
                static readonly XmlQualifiedName anyType = new XmlQualifiedName ("anyType",XmlSchema.Namespace);\r
                static readonly XmlQualifiedName arrayType = new XmlQualifiedName ("Array",XmlSerializer.EncodingNamespace);\r
                static readonly XmlQualifiedName arrayTypeRefName = new XmlQualifiedName ("arrayType",XmlSerializer.EncodingNamespace);\r

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
index dd30cbbb8f957a37ae0c8ff5fcb4613abc57d52a..bcc05dc651fd5dac7fb24cf0bb9be9a117d516e8 100644 (file)
--- 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)