2006-02-03 Zoltan Varga <vargaz@gmail.com>

	* CryptoStream.cs: Add 'override' keyword to Dispose (bool) method in 2.0.

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

diff --git a/mcs/class/corlib/System.Security.Cryptography/ChangeLog b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
index de22f2c40f47dacdfdb3e37627c96159942771af..85e4e960b09732050973e6a3c2517718407ef960 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/ChangeLog
+++ b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-03  Zoltan Varga  <vargaz@gmail.com>
+
+       * CryptoStream.cs: Add 'override' keyword to Dispose (bool) method in 2.0.
+
 2005-12-15  Sebastien Pouliot  <sebastien@ximian.com>
 
        * SymmetricAlgorithm.cs: Changing (not setting) BlockSize must 

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
index 4c0ab0561a8ed3d6c5612a067cb9a20891433969..28511eec1b188f35b13439e594222453907814e5 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
@@ -345,7 +345,11 @@ namespace System.Security.Cryptography {
                        throw new NotSupportedException ("SetLength");
                }
 
+#if NET_2_0
+               protected override void Dispose (bool disposing) 
+#else
                protected virtual void Dispose (bool disposing) 
+#endif
                {
                        if (!_disposed) {
                                _disposed = true;