* SoapFormatter.cs: sealed class and added ComVisible attribute

to FilterLevel property to match MS.NET
* SoapTypeMapper.cs: fixed compiler warnings

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

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
index c8b32c1fc371734d8a51e8ffd00c679046b52579..c746524483cd8de93d699483a4148a36b6fabccc 100644 (file)
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-10  Gert Driesen (drieseng@users.sourceforge.net)
+       * SoapFormatter.cs: sealed class and added ComVisible attribute
+       to FilterLevel property to match MS.NET
+       * SoapTypeMapper.cs: fixed compiler warnings
+
 2004-05-07  Lluis Sanchez Gual <lluis@ximian.com>
 
        * SoapWriter.cs: Fixed string formatting.

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
index 7065b35c5f66246bbc0bf72d1102555c423413a3..51d09abf1390445d54577120082b36ca60ec837f 100755 (executable)
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
@@ -9,6 +9,7 @@
 using System;\r
 using System.IO;\r
 using System.Reflection;\r
+using System.Runtime.InteropServices;\r
 using System.Runtime.Remoting;\r
 using System.Runtime.Serialization;\r
 using System.Runtime.Remoting.Messaging;\r
@@ -22,7 +23,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                MethodCall, MethodResponse, ServerFault, NotRecognize\r
        }\r
        \r
-       public class SoapFormatter: IRemotingFormatter, IFormatter {\r
+       public sealed class SoapFormatter: IRemotingFormatter, IFormatter {\r
                private SoapWriter _soapWriter;\r
                private SerializationBinder _binder;\r
                private StreamingContext _context;\r
@@ -134,6 +135,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                \r
 #if NET_1_1\r
                [MonoTODO ("Interpret this")]\r
+               [ComVisible(false)]\r
                public TypeFilterLevel FilterLevel {\r
                        get {\r
                                return _filterLevel;\r

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
index 53570492a03f54795bb12fb6b8db4d1e554eef7e..b5c533ecaafd744c1d8b2f7026cb5a0f84f60f4d 100644 (file)
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
@@ -87,7 +87,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                public static readonly string SoapEncodingPrefix = "SOAP-ENC";
                public static readonly string SoapEnvelopeNamespace = "http://schemas.xmlsoap.org/soap/envelope/";
                public static readonly string SoapEnvelopePrefix = "SOAP-ENV";
-               internal static readonly string SoapEnvelope;
+               //internal static readonly string SoapEnvelope;
                private XmlTextWriter _xmlWriter;
                private long _prefixNumber;
                private Hashtable namespaceToPrefixTable = new Hashtable();
@@ -112,7 +112,6 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        _xmlWriter = xmlWriter;
                        _assemblyFormat = assemblyFormat;
                        _prefixNumber = 1;
-                       Element element;
                        Type elementType;
                        elementType = typeof(string);
                        if(typeFormat == FormatterTypeStyle.XsdString)\r