Merge pull request #347 from JamesB7/master

[mono.git] / mcs / class / System.Runtime.Serialization.Formatters.Soap / System.Runtime.Serialization.Formatters.Soap / SoapFormatter.cs

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 d6f66de4daf39f3612df85eb4dd57fa7ed1f8eac..8fd2335c79255f98c69aae01de54f9c66234e771 100644 (file)
--- 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
@@ -52,9 +52,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                private FormatterTypeStyle _typeFormat = FormatterTypeStyle.TypesWhenNeeded;\r
                private ISoapMessage _topObject = null;\r
                \r
-#if NET_1_1\r
                TypeFilterLevel _filterLevel = TypeFilterLevel.Low;\r
-#endif\r
 \r
                public SoapFormatter() {\r
                        _selector = null;\r
@@ -146,11 +144,7 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                        }\r
                }\r
                \r
-#if NET_1_1\r
                [MonoTODO ("Interpret this")]\r
-#if ONLY_1_1\r
-               [ComVisible(false)]\r
-#endif\r
                public TypeFilterLevel FilterLevel {\r
                        get {\r
                                return _filterLevel;\r
@@ -159,7 +153,6 @@ namespace System.Runtime.Serialization.Formatters.Soap {
                                _filterLevel = value;\r
                        }\r
                }\r
-#endif\r
                \r
                public FormatterAssemblyStyle AssemblyFormat\r
                {\r