* Dictionary.cs (Do_ICollectionCopyTo): Revert 2009-10-01 change.

Use BOOTSTRAP_BASIC to hide code from gmcs 2.4.x.

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

diff --git a/mcs/class/corlib/System.Collections.Generic/ChangeLog b/mcs/class/corlib/System.Collections.Generic/ChangeLog
index ee4290744ab440d9e5648067b14c1d5626f3f94e..919afc47ef203222c949688d04994558d4fba182 100644 (file)
--- a/mcs/class/corlib/System.Collections.Generic/ChangeLog
+++ b/mcs/class/corlib/System.Collections.Generic/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-02  Raja R Harinath  <harinath@hurrynot.org>
+
+       * Dictionary.cs (Do_ICollectionCopyTo): Revert 2009-10-01 change.
+       Use BOOTSTRAP_BASIC to hide code from gmcs 2.4.x.
+
 2009-10-01  Marek Habersack  <mhabersack@novell.com>
 
        * Dictionary.cs: cast target array to TRet[] instead of object[] -

diff --git a/mcs/class/corlib/System.Collections.Generic/Dictionary.cs b/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
index ceb2d0d948f2bb8b6c1b44e0d4817849c0462683..7ebb4b07d5b988d12e2fa6e1ca20735c8d169df9 100644 (file)
--- a/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
+++ b/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
@@ -340,7 +340,13 @@ namespace System.Collections.Generic {
                                if ((src.IsPrimitive || tgt.IsPrimitive) && !tgt.IsAssignableFrom (src))
                                        throw new Exception (); // we don't care.  it'll get transformed to an ArgumentException below
 
-                               Do_CopyTo <TRet, TRet> ((TRet []) array, index, transform);
+#if BOOTSTRAP_BASIC
+                               // BOOTSTRAP: gmcs 2.4.x seems to have trouble compiling the alternative
+                               throw new Exception ();
+#else
+                               Do_CopyTo ((object []) array, index, transform);
+#endif
+
                        } catch (Exception e) {
                                throw new ArgumentException ("Cannot copy source collection elements to destination array", "array", e);
                        }