Merge remote branch 'upstream/master'

[mono.git] / mcs / class / corlib / System.Collections.Concurrent / Partitioner.cs

diff --git a/mcs/class/corlib/System.Collections.Concurrent/Partitioner.cs b/mcs/class/corlib/System.Collections.Concurrent/Partitioner.cs
index a3f17f2ead54893c8d89ee8eb88193e6e6df9b72..92b5665712cfbf2eea2fd2db9d956672ecd3d4ee 100644 (file)
--- a/mcs/class/corlib/System.Collections.Concurrent/Partitioner.cs
+++ b/mcs/class/corlib/System.Collections.Concurrent/Partitioner.cs
@@ -24,13 +24,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0
+
 using System;
 using System.Collections.Generic;
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
-
 namespace System.Collections.Concurrent
 {
+       using Partitioners;
+
        public static class Partitioner
        {
                public static OrderablePartitioner<TSource> Create<TSource> (IEnumerable<TSource> source)
@@ -42,14 +44,14 @@ namespace System.Collections.Concurrent
                        return new EnumerablePartitioner<TSource> (source);
                }
                
-               public static OrderablePartitioner<TSource> Create<TSource> (TSource[] source, bool loadBalance)
+               public static OrderablePartitioner<TSource> Create<TSource> (TSource[] array, bool loadBalance)
                {
-                       return Create ((IList<TSource>)source, loadBalance);
+                       return Create ((IList<TSource>)array, loadBalance);
                }
                
-               public static OrderablePartitioner<TSource> Create<TSource> (IList<TSource> source, bool loadBalance)
+               public static OrderablePartitioner<TSource> Create<TSource> (IList<TSource> list, bool loadBalance)
                {
-                       return new ListPartitioner<TSource> (source);
+                       return new ListPartitioner<TSource> (list);
                }
                
                public static OrderablePartitioner<Tuple<int, int>> Create (int fromInclusive,