reverting, somehow this breaks the linker

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

diff --git a/mcs/class/corlib/System.Collections/ChangeLog b/mcs/class/corlib/System.Collections/ChangeLog
index cf9097739f6513f43a121e5fd8f870782ac99b1a..45deb94bdb4a24ca685ba79c3cc42fb0a5df5b6c 100644 (file)
--- a/mcs/class/corlib/System.Collections/ChangeLog
+++ b/mcs/class/corlib/System.Collections/ChangeLog
@@ -1,13 +1,3 @@
-2008-05-23  Miguel de Icaza  <miguel@novell.com>
-
-       * Hashtable.cs: Implement a faster clone that does not use an
-       enumerator to iterate over the values, this doubles the speed of
-       Clone.
-
-       The use of an internal constructor that builds from a Hashtable is
-       done to avoid populating a Hashtable and then updating every field
-       and structure with new data. 
-
 2008-05-08  Robert Jordan  <robertj@gmx.net>
 
        * DictionaryEntry.cs: Rename fields for serialization

diff --git a/mcs/class/corlib/System.Collections/Hashtable.cs b/mcs/class/corlib/System.Collections/Hashtable.cs
index cb1e2842e42604093c80dc79ba38332c79912f4b..b3a894bb28ea7d33f087a8c141a3fdb1664f9e65 100644 (file)
--- a/mcs/class/corlib/System.Collections/Hashtable.cs
+++ b/mcs/class/corlib/System.Collections/Hashtable.cs
@@ -175,26 +175,6 @@ namespace System.Collections {
                {
                }
 
-               //
-               // Used as a faster Clone
-               //
-               internal Hashtable (Hashtable source)
-               {
-                       inUse = source.inUse;
-                       loadFactor = source.loadFactor;
-
-                       table = (Slot []) source.table.Clone ();
-                       hashes = (int []) source.hashes.Clone ();
-                       threshold = source.threshold;
-                       hcpRef = source.hcpRef;
-                       comparerRef = source.comparerRef;
-                       serializationInfo = source.serializationInfo;
-
-#if NET_2_0
-                       equalityComparer = source.equalityComparer;
-#endif
-               }
-                       
 #if NET_2_0
                [Obsolete ("Please use Hashtable(int, IEqualityComparer) instead")]
 #endif
@@ -539,7 +519,25 @@ namespace System.Collections {
 
                public virtual object Clone ()
                {
-                       return new Hashtable (this);
+#if NET_2_0
+                       Hashtable ht = new Hashtable (Count, equalityComparer);
+                       ht.hcp = this.hcp;
+                       ht.comparer = this.comparer;
+#else
+                       Hashtable ht = new Hashtable (Count, hcp, comparer);
+#endif
+                       ht.inUse = 0;
+                       ht.loadFactor = this.loadFactor;
+
+                       // FIXME: maybe it's faster to simply
+                       //        copy the back-end array?
+
+                       IDictionaryEnumerator it = GetEnumerator ();
+                       while (it.MoveNext ()) {
+                               ht [it.Key] = it.Value;
+                       }
+
+                       return ht;
                }
 
                public virtual void GetObjectData (SerializationInfo info, StreamingContext context)

diff --git a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs
index ca0766a8cdedbfd724ecb1c0e9bed48cdb77b6d3..dc4e817d2a3391b2926c5ff6221744b03f9c5b06 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs
+++ b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs
@@ -292,23 +292,6 @@ public class HashtableTest : Assertion {
                             0, h.Count);\r
        }\r
 \r
-#if NET_2_0\r
-       public class MyEqualityComparer : IEqualityComparer {\r
-               public bool Equals (object x, object y) { return x == y; }\r
-               public int GetHashCode (object obj) { return 1; }\r
-       }\r
-\r
-       public class MyHashtable : Hashtable {\r
-               public MyHashtable (IEqualityComparer c): base (c){}\r
-\r
-               public IEqualityComparer GetComparer ()\r
-               {\r
-                       return EqualityComparer;\r
-               }\r
-       }\r
-       \r
-#endif\r
-       \r
         [Test]\r
        public void TestClone() {\r
                {\r
@@ -346,15 +329,6 @@ public class HashtableTest : Assertion {
 \r
                        ((char[])h1[c1[0]])[0] = 'z';\r
                        AssertEquals("shallow copy", h1[c1[0]], h2[c1[0]]);\r
-\r
-#if NET_2_0\r
-                       // NET 2.0 stuff\r
-                       MyEqualityComparer a = new MyEqualityComparer ();\r
-                       MyHashtable mh1 = new MyHashtable (a);\r
-                       MyHashtable mh2 = (MyHashtable) h1.Clone ();\r
-                       \r
-                       AssertEquals ("EqualityComparer", mh1.GetComparer (), mh2.GetComparer ());\r
-#endif\r
                }\r
        }\r
 \r