Skip to content

Commit f8c0863

Browse files
committed
Eliminated unneeded ifdef statements (This library will never aim to target less than the 4.0 ABI) and such
1 parent d9b681a commit f8c0863

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+10
-510
lines changed

System.Collections.Concurrent.Partitioners/EnumerablePartitioner.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@
2424
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
// THE SOFTWARE.
2626

27-
#if NET_4_0
28-
2927
using System;
30-
using System.Threading;
31-
using System.Threading.Tasks;
3228
using System.Collections.Generic;
3329

3430
namespace System.Collections.Concurrent.Partitioners
@@ -150,4 +146,3 @@ class PartitionerState
150146
}
151147
}
152148
}
153-
#endif

System.Collections.Concurrent.Partitioners/ListPartitioner.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@
2424
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
// THE SOFTWARE.
2626

27-
#if NET_4_0
28-
2927
using System;
30-
using System.Threading;
3128
using System.Collections.Generic;
32-
using System.Runtime.InteropServices;
3329

3430
namespace System.Collections.Concurrent.Partitioners
3531
{
@@ -117,4 +113,3 @@ IEnumerator<KeyValuePair<long, T>> GetEnumeratorForRangeInternal (Range[] ranges
117113
}
118114
}
119115
}
120-
#endif

System.Collections.Concurrent.Partitioners/UserRangePartitioner.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
// THE SOFTWARE.
2626

27-
#if NET_4_0
28-
2927
using System;
3028
using System.Threading;
3129
using System.Collections.Generic;
@@ -118,4 +116,3 @@ IEnumerator<KeyValuePair<long, Tuple<long, long>>> GetEnumerator (Func<long> get
118116
}
119117
}
120118
}
121-
#endif

System.Collections.Concurrent/BlockingCollection.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
//
2424
//
2525

26-
#if NET_4_0
27-
2826
using System;
2927
using System.Threading;
3028
using System.Collections;
@@ -561,4 +559,3 @@ bool ICollection.IsSynchronized {
561559
}
562560
}
563561
}
564-
#endif

System.Collections.Concurrent/ConcurrentDictionary.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,9 @@
2222
//
2323
//
2424

25-
#if NET_4_0
26-
2725
using System;
28-
using System.Threading;
2926
using System.Collections;
3027
using System.Collections.Generic;
31-
using System.Runtime.Serialization;
3228
using System.Diagnostics;
3329

3430
namespace System.Collections.Concurrent
@@ -462,4 +458,3 @@ uint Hash (TKey key)
462458
}
463459
}
464460
}
465-
#endif

System.Collections.Concurrent/ConcurrentOrderedList.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,13 @@
2222
//
2323
//
2424

25-
#if NET_4_0
26-
2725
using System;
2826
using System.Threading;
2927
using System.Collections;
3028
using System.Collections.Generic;
31-
using System.Runtime.Serialization;
32-
33-
#if INSIDE_MONO_PARALLEL
34-
using System.Collections.Concurrent;
3529

36-
namespace Mono.Collections.Concurrent
37-
#else
3830
namespace System.Collections.Concurrent
39-
#endif
4031
{
41-
#if INSIDE_MONO_PARALLEL
42-
public
43-
#endif
4432
class ConcurrentOrderedList<T>: ICollection<T>, IEnumerable<T>
4533
{
4634
class Node
@@ -336,5 +324,3 @@ bool ICollection<T>.Remove (T item)
336324
}
337325
}
338326
}
339-
340-
#endif

System.Collections.Concurrent/ConcurrentQueue.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@
2222
//
2323
//
2424

25-
#if NET_4_0
26-
2725
using System;
2826
using System.Threading;
2927
using System.Collections;
3028
using System.Collections.Generic;
31-
using System.Runtime.Serialization;
3229

3330
namespace System.Collections.Concurrent
3431
{
@@ -242,4 +239,3 @@ public bool IsEmpty {
242239
}
243240
}
244241
}
245-
#endif

System.Collections.Concurrent/ConcurrentStack.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,10 @@
2626
//
2727
//
2828

29-
#if NET_4_0
30-
3129
using System;
3230
using System.Threading;
3331
using System.Collections;
3432
using System.Collections.Generic;
35-
using System.Runtime.Serialization;
3633

3734
namespace System.Collections.Concurrent
3835
{
@@ -279,5 +276,3 @@ static void RangeArgumentsCheck (T[] items, int startIndex, int count)
279276
}
280277
}
281278
}
282-
#endif
283-

System.Collections.Concurrent/IProducerConsumerCollection.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
//
2323
//
2424

25-
#if NET_4_0
26-
using System;
2725
using System.Collections;
2826
using System.Collections.Generic;
2927

@@ -37,4 +35,3 @@ public interface IProducerConsumerCollection<T> : IEnumerable<T>, ICollection, I
3735
void CopyTo (T[] array, int index);
3836
}
3937
}
40-
#endif

System.Collections.Concurrent/OrderablePartitioner.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
// THE SOFTWARE.
2626

27-
#if NET_4_0
28-
2927
using System;
3028
using System.Collections.Generic;
3129

@@ -141,4 +139,3 @@ public TSource Current {
141139
}
142140
}
143141
}
144-
#endif

0 commit comments

Comments
 (0)