Merge pull request #697 from linquize/atom-bug

[mono.git] / mcs / class / corlib / System.Security.Cryptography / FromBase64Transform.cs

diff --git a/mcs/class/corlib/System.Security.Cryptography/FromBase64Transform.cs b/mcs/class/corlib/System.Security.Cryptography/FromBase64Transform.cs
index 981bebf06616b541561d97f70d89de105166ddfc..bf4150c57d1e404e332ab54d4348388f60c5b90b 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/FromBase64Transform.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/FromBase64Transform.cs
@@ -1,5 +1,5 @@
 //
-// System.Security.Cryptography.FromBase64Transform
+// System.Security.Cryptography.FromBase64Transform.cs
 //
 // Authors:
 //     Sergey Chaban (serge@wildwestsoftware.com)
@@ -33,17 +33,13 @@ using System.Runtime.InteropServices;
 namespace System.Security.Cryptography {
 
        [Serializable]
-#if NET_2_0
        [ComVisible (true)]
-#endif
        public enum FromBase64TransformMode : int {
                IgnoreWhiteSpaces,
                DoNotIgnoreWhiteSpaces
        }
 
-#if NET_2_0
        [ComVisible (true)]
-#endif
        public class FromBase64Transform : ICryptoTransform {
 
                private FromBase64TransformMode mode;
@@ -58,9 +54,9 @@ namespace System.Security.Cryptography {
                {
                }
 
-               public FromBase64Transform (FromBase64TransformMode mode)
+               public FromBase64Transform (FromBase64TransformMode whitespaces)
                {
-                       this.mode = mode;
+                       this.mode = whitespaces;
                        accumulator = new byte [4];
                        accPtr = 0;
                        m_disposed = false;
@@ -92,7 +88,11 @@ namespace System.Security.Cryptography {
                        Dispose (true);
                }
 
+#if NET_4_0
+               public void Dispose ()
+#else
                void IDisposable.Dispose () 
+#endif
                {
                        Dispose (true);
                        GC.SuppressFinalize (this);  // Finalization is now unnecessary