Author: alp
Date: 2007-04-03 04:42:37 -0400 (Tue, 03 Apr 2007)
New Revision: 75329
Modified:
trunk/mcs/class/corlib/System/ChangeLog
trunk/mcs/class/corlib/System/Delegate.cs
Log:
2007-04-03 Alp Toker <[EMAIL PROTECTED]>
* Delegate.cs: Combine(Delegate[]) is params in 2.0.
Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog 2007-04-03 08:30:59 UTC (rev
75328)
+++ trunk/mcs/class/corlib/System/ChangeLog 2007-04-03 08:42:37 UTC (rev
75329)
@@ -1,3 +1,7 @@
+2007-04-03 Alp Toker <[EMAIL PROTECTED]>
+
+ * Delegate.cs: Combine(Delegate[]) is params in 2.0.
+
2007-03-27 Dick Porter <[EMAIL PROTECTED]>
* Environment.cs: Increment mono_corlib_version;
Modified: trunk/mcs/class/corlib/System/Delegate.cs
===================================================================
--- trunk/mcs/class/corlib/System/Delegate.cs 2007-04-03 08:30:59 UTC (rev
75328)
+++ trunk/mcs/class/corlib/System/Delegate.cs 2007-04-03 08:42:37 UTC (rev
75329)
@@ -393,7 +393,11 @@
/// Returns a new MulticastDelegate holding the
/// concatenated invocation lists of an Array of
MulticastDelegates
/// </symmary>
+#if NET_2_0
+ public static Delegate Combine (params Delegate[] delegates)
+#else
public static Delegate Combine (Delegate[] delegates)
+#endif
{
if (delegates == null)
return null;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches