Jumbo patch for NET_2_0, mscorlib is now clean

[mono.git] / mcs / class / corlib / System.IO / Stream.cs

diff --git a/mcs/class/corlib/System.IO/Stream.cs b/mcs/class/corlib/System.IO/Stream.cs
index 31fc07cd44bff43b5238e26b34c70abd8dbc72bc..d6e0359a86713b8a913ee9e47ef0c26ca95d9569 100644 (file)
--- a/mcs/class/corlib/System.IO/Stream.cs
+++ b/mcs/class/corlib/System.IO/Stream.cs
@@ -40,9 +40,7 @@ using System.Runtime.InteropServices;
 namespace System.IO
 {
        [Serializable]
-#if NET_2_0
        [ComVisible (true)]
-#endif
 #if NET_2_1
        public abstract class Stream : IDisposable
 #else
@@ -70,14 +68,12 @@ namespace System.IO
                        get;
                }
 
-#if NET_2_0
                [ComVisible (false)]
                public virtual bool CanTimeout {
                        get {
                                return false;
                        }
                }
-#endif
 
                public abstract long Length
                {
@@ -91,7 +87,6 @@ namespace System.IO
                }
 
 
-#if NET_2_0
                // 2.0 version of Dispose.
                public void Dispose ()
                {
@@ -136,22 +131,8 @@ namespace System.IO
                {
                        throw new NotImplementedException ();
                }
-#else
-               // 1.1 version of Close
-               public virtual void Close ()
-               {
-                       // nothing
-               }
 
-               void IDisposable.Dispose ()
-               {
-                       Close ();
-               }
-#endif
-
-#if NET_2_0
                [Obsolete ("CreateWaitHandle is due for removal.  Use \"new ManualResetEvent(false)\" instead.")]
-#endif
                protected virtual WaitHandle CreateWaitHandle()
                {
                        return new ManualResetEvent (false);