[sgen] Untag the vtable during concurrent mark

[mono.git] / mcs / class / System.XML / System.Xml.Serialization / XmlCodeExporter.cs

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
index 5c07bcd028084fffa2ba8a9f12b3c37662baff2c..3c9246a71ca6b1d5639f03d3b08e510b7137dda4 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
@@ -38,17 +38,11 @@ namespace System.Xml.Serialization
 {
 
        public class XmlCodeExporter 
-#if NET_2_0
                : CodeExporter
-#endif
        {
                #region Fields
 
-#if NET_2_0
-               CodeGenerationOptions options;
-#else
-               XmlMapCodeGenerator codeGenerator;
-#endif
+               // CodeGenerationOptions options;
 
                #endregion
 
@@ -60,14 +54,9 @@ namespace System.Xml.Serialization
 
                public XmlCodeExporter (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit)
                {
-#if NET_2_0
                        codeGenerator = new XmlMapCodeGenerator (codeNamespace, codeCompileUnit, CodeGenerationOptions.GenerateProperties);
-#else
-                       codeGenerator = new XmlMapCodeGenerator (codeNamespace, codeCompileUnit, CodeGenerationOptions.None);
-#endif
                }
 
-#if NET_2_0
                public XmlCodeExporter (CodeNamespace codeNamespace, 
                                                                CodeCompileUnit codeCompileUnit, 
                                                                CodeGenerationOptions options)
@@ -93,17 +82,11 @@ namespace System.Xml.Serialization
                {
                        codeGenerator = new XmlMapCodeGenerator (codeNamespace, codeCompileUnit, codeProvider, options, mappings);
                }
-#endif
 
                #endregion // Constructors
 
                #region Properties
 
-#if !NET_2_0
-               public CodeAttributeDeclarationCollection IncludeMetadata {
-                       get { return codeGenerator.IncludeMetadata; }
-               }
-#endif
 
                #endregion Properties
 
@@ -114,16 +97,16 @@ namespace System.Xml.Serialization
                        AddMappingMetadata (metadata, member, ns, false);
                }
 
-               public void AddMappingMetadata (CodeAttributeDeclarationCollection metadata, XmlTypeMapping member, string ns)
+               public void AddMappingMetadata (CodeAttributeDeclarationCollection metadata, XmlTypeMapping mapping, string ns)
                {
-                       if ( (member.TypeData.SchemaType == SchemaTypes.Primitive ||
-                             member.TypeData.SchemaType == SchemaTypes.Array) 
-                               && member.Namespace != XmlSchema.Namespace)
+                       if ( (mapping.TypeData.SchemaType == SchemaTypes.Primitive ||
+                             mapping.TypeData.SchemaType == SchemaTypes.Array) 
+                               && mapping.Namespace != XmlSchema.Namespace)
                        {
                                CodeAttributeDeclaration ratt = new CodeAttributeDeclaration ("System.Xml.Serialization.XmlRoot");
-                               ratt.Arguments.Add (MapCodeGenerator.GetArg (member.ElementName));
-                               ratt.Arguments.Add (MapCodeGenerator.GetArg ("Namespace", member.Namespace));
-                               ratt.Arguments.Add (MapCodeGenerator.GetArg ("IsNullable", member.IsNullable));
+                               ratt.Arguments.Add (MapCodeGenerator.GetArg (mapping.ElementName));
+                               ratt.Arguments.Add (MapCodeGenerator.GetArg ("Namespace", mapping.Namespace));
+                               ratt.Arguments.Add (MapCodeGenerator.GetArg ("IsNullable", mapping.IsNullable));
                                metadata.Add (ratt);
                        }
                }