Author: marek
Date: 2007-09-11 06:49:19 -0400 (Tue, 11 Sep 2007)
New Revision: 85631

Modified:
   trunk/mcs/class/System.Core/System.Linq/ChangeLog
   trunk/mcs/class/System.Core/System.Linq/Enumerable.cs
Log:
2007-09-11  Marek Safar <[EMAIL PROTECTED]>

        * Enumerable.cs: Fixed Join recursion.
        


Modified: trunk/mcs/class/System.Core/System.Linq/ChangeLog
===================================================================
--- trunk/mcs/class/System.Core/System.Linq/ChangeLog   2007-09-11 10:10:16 UTC 
(rev 85630)
+++ trunk/mcs/class/System.Core/System.Linq/ChangeLog   2007-09-11 10:49:19 UTC 
(rev 85631)
@@ -1,3 +1,7 @@
+2007-09-11  Marek Safar <[EMAIL PROTECTED]>
+
+       * Enumerable.cs: Fixed Join recursion.
+
 2007-08-22  Marek Safar <[EMAIL PROTECTED]>
 
        * Enumerable.cs: More SelectionMany.

Modified: trunk/mcs/class/System.Core/System.Linq/Enumerable.cs
===================================================================
--- trunk/mcs/class/System.Core/System.Linq/Enumerable.cs       2007-09-11 
10:10:16 UTC (rev 85630)
+++ trunk/mcs/class/System.Core/System.Linq/Enumerable.cs       2007-09-11 
10:49:19 UTC (rev 85631)
@@ -739,30 +739,30 @@
 
         #region FirstOrDefault
 
-        public static T FirstOrDefault<T>(this IEnumerable<T> source)
+        public static TSource FirstOrDefault<TSource>(this 
IEnumerable<TSource> source)
         {
             if (source == null)
                 throw new ArgumentNullException();
 
-            foreach (T element in source)
+            foreach (TSource element in source)
                 return element;
 
-            return default(T);
+            return default(TSource);
         }
 
 
-        public static T FirstOrDefault<T>(this IEnumerable<T> source, Func<T, 
bool> predicate)
+        public static TSource FirstOrDefault<TSource>(this 
IEnumerable<TSource> source, Func<TSource, bool> predicate)
         {
             if (source == null || predicate == null)
                 throw new ArgumentNullException();
 
-            foreach (T element in source)
+            foreach (TSource element in source)
             {
                 if (predicate(element))
                     return element;
             }
 
-            return default(T);
+            return default(TSource);
         }
 
         #endregion
@@ -1009,7 +1009,7 @@
             IEnumerable<TInner> inner, Func<TOuter, TKey> outerKeySelector,
             Func<TInner, TKey> innerKeySelector, Func<TOuter, TInner, TResult> 
resultSelector)
         {
-            return Join<TOuter, TInner, TKey, TResult>(outer, inner, 
outerKeySelector, innerKeySelector, resultSelector);
+            return Join<TOuter, TInner, TKey, TResult>(outer, inner, 
outerKeySelector, innerKeySelector, resultSelector, null);
         }
         # endregion
 
@@ -2830,7 +2830,7 @@
 
         #region IndexOf
 
-        public static int IndexOf<T>(this IEnumerable<T> source, T item, 
IEqualityComparer<T> comparer)
+        static int IndexOf<T>(this IEnumerable<T> source, T item, 
IEqualityComparer<T> comparer)
         {
             if (comparer == null)
                 comparer = EqualityComparer<T>.Default;
@@ -2846,7 +2846,7 @@
             return -1;
         }
 
-        public static int IndexOf<T>(this IEnumerable<T> source, T item)
+        static int IndexOf<T>(this IEnumerable<T> source, T item)
         {
             return IndexOf<T>(source, item, null);
         }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to