UnicodeEncoding.cs: Override GetString (byte [], int, int) in profile 1.x as well...

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

diff --git a/mcs/class/corlib/System.Text/ChangeLog b/mcs/class/corlib/System.Text/ChangeLog
index 526141df114c421527c013eab55a7d7e4330759c..6b7890929613b95a6ca89ba776b8ee1fab2212bf 100644 (file)
--- a/mcs/class/corlib/System.Text/ChangeLog
+++ b/mcs/class/corlib/System.Text/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-06  Kornél Pál  <kornelpal@gmail.com>
+
+       * UnicodeEncoding.cs: Override GetString (byte [], int, int) in
+         profile 1.x as well because performance improvement is worth the
+         signature difference. (Fix regression of r61250.)
+
 2006-05-30  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * ASCIIEncoding.cs: Marked class ComVisible (true) on 2.0 profile.

diff --git a/mcs/class/corlib/System.Text/UnicodeEncoding.cs b/mcs/class/corlib/System.Text/UnicodeEncoding.cs
index 707b52ba4002f0cd1c01903354a6a94bf7e22f29..49bc3f7919166685a5c13fbdefe8d01af163fd70 100644 (file)
--- a/mcs/class/corlib/System.Text/UnicodeEncoding.cs
+++ b/mcs/class/corlib/System.Text/UnicodeEncoding.cs
@@ -315,6 +315,7 @@ public class UnicodeEncoding : Encoding
 
                return GetCharsInternal (bytes, byteCount, chars, charCount);
        }
+#endif
 
        // Decode a buffer of bytes into a string.
        [ComVisible (false)]
@@ -340,7 +341,6 @@ public class UnicodeEncoding : Encoding
 
                return s;
        }
-#endif
 
        private unsafe int GetCharsInternal (byte* bytes, int byteCount,
                                                                                char* chars, int charCount)