Просмотр исходного кода

2004-11-30 Lluis Sanchez Gual <[email protected]>

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


svn path=/trunk/mcs/; revision=36831
Lluis Sanchez 21 лет назад
Родитель
Сommit
efb43a36d5

+ 5 - 0
mcs/class/System.XML/System.Xml.Serialization/ChangeLog

@@ -1,3 +1,8 @@
+2004-11-30  Lluis Sanchez Gual  <[email protected]>
+
+	* XmlCodeExporter.cs, XmlSerializer.cs, XmlSchemaImporter.cs: Fixed some
+	compilation warnings.
+
 2004-11-24  Lluis Sanchez Gual  <[email protected]>
 
 	* SerializationSource.cs: Made SerializationSource abstract, and

+ 0 - 1
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;

+ 4 - 1
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);

+ 1 - 3
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)