From: Jérémie Laval <jeremie.laval@gmail.com>
Date: Tue, 4 Sep 2012 11:12:00 +0000 (+0100)
Subject: [System.Core] Remove generic indirection for ToList
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=db21dd426be9aef682aeae21d0eac3935ece3f85;p=mono.git

[System.Core] Remove generic indirection for ToList
---

diff --git a/mcs/class/System.Core/System.Linq/ParallelEnumerable.cs b/mcs/class/System.Core/System.Linq/ParallelEnumerable.cs
index d85d30c24c6..6236f485baa 100644
--- a/mcs/class/System.Core/System.Linq/ParallelEnumerable.cs
+++ b/mcs/class/System.Core/System.Linq/ParallelEnumerable.cs
@@ -1912,13 +1912,39 @@ namespace System.Linq
 			if (source.Node.IsOrdered ())
 				return ToListOrdered (source);
 
-			List<TSource> temp = source.Aggregate (() => new List<TSource>(50),
-			                                       (list, e) => { list.Add (e); return list; },
-			                                       (list, list2) => { list.AddRange (list2); return list; },
-			                                       (list) => list);
+			var helper = new ListAggregateHelper<TSource> ();
+			List<TSource> temp = source.Aggregate (helper.Seed,
+			                                       helper.Intermediate,
+			                                       helper.Reducer,
+			                                       helper.Final);
 			return temp;
 		}
 
+		class ListAggregateHelper<TSource>
+		{
+			public List<TSource> Seed ()
+			{
+				return new List<TSource> (50);
+			}
+
+			public List<TSource> Intermediate (List<TSource> list, TSource e)
+			{
+				list.Add (e);
+				return list;
+			}
+
+			public List<TSource> Reducer (List<TSource> list, List<TSource> list2)
+			{
+				list.AddRange (list2);
+				return list;
+			}
+
+			public List<TSource> Final (List<TSource> list)
+			{
+				return list;
+			}
+		}
+
 		internal static List<TSource> ToListOrdered<TSource> (this ParallelQuery<TSource> source)
 		{
 			List<TSource> result = new List<TSource> ();