2009-10-06 Sebastien Pouliot <sebastien@ximian.com>

	* Encoding.cs: Remove normalization methods for Moonlight

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

diff --git a/mcs/class/corlib/System.Text/ChangeLog b/mcs/class/corlib/System.Text/ChangeLog
index 1136d9bcb2dd8a8f5dc76b9706058e19fe023f56..8d02ca3823a725e8b1caeab4dbac38bc1897f756 100644 (file)
--- a/mcs/class/corlib/System.Text/ChangeLog
+++ b/mcs/class/corlib/System.Text/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-06  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * Encoding.cs: Remove normalization methods for Moonlight
+
 2009-09-23  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Encoding.cs: Add back UTF32 since it's useful for smcs

diff --git a/mcs/class/corlib/System.Text/Encoding.cs b/mcs/class/corlib/System.Text/Encoding.cs
index e7d61609b3e617d6379290de305558b781618d60..be86cc2dab6c999778a11a3ac561b44890956978 100644 (file)
--- a/mcs/class/corlib/System.Text/Encoding.cs
+++ b/mcs/class/corlib/System.Text/Encoding.cs
@@ -605,6 +605,7 @@ public abstract class Encoding
                return encoding_infos;
        }
 
+#if !NET_2_1 || MONOTOUCH
        [ComVisible (false)]
        public bool IsAlwaysNormalized ()
        {
@@ -617,6 +618,8 @@ public abstract class Encoding
                // umm, ASCIIEncoding should have overriden this method, no?
                return form == NormalizationForm.FormC && this is ASCIIEncoding;
        }
+#endif // NET_2_1
+
 #endif
 
        // Table of builtin web encoding names and the corresponding code pages.