From b9ce05f29622898aeb345d5bea84668013ddb01e Mon Sep 17 00:00:00 2001
From: miguel <miguel@e3ebcda4-bce8-0310-ba0a-eca2169e7518>
Date: Tue, 10 Nov 2009 17:31:08 +0000
Subject: [PATCH] Few more 4.0 touchups

git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@145858 e3ebcda4-bce8-0310-ba0a-eca2169e7518
---
 .../ConcurrentDictionary.cs                        | 31 +----------------
 class/corlib/System/LazyExecutionMode.cs           | 40 ----------------------
 class/corlib/corlib.dll.sources                    |  1 -
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 class/corlib/System/LazyExecutionMode.cs

diff --git a/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs b/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs
index 856018c911..48789e03b6 100644
--- a/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs
+++ b/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs
@@ -33,7 +33,7 @@ namespace System.Collections.Concurrent
 {
 	public class ConcurrentDictionary<TKey, TValue> : IDictionary<TKey, TValue>, 
 	  ICollection<KeyValuePair<TKey, TValue>>, IEnumerable<KeyValuePair<TKey, TValue>>, 
-	  IDictionary, ICollection, IEnumerable, ISerializable, IDeserializationCallback
+	  IDictionary, ICollection, IEnumerable
 	{
 		class Pair
 		{
@@ -114,12 +114,6 @@ namespace System.Collections.Concurrent
 			
 		}
 		
-		[MonoTODO]
-		protected ConcurrentDictionary (SerializationInfo info, StreamingContext context)
-		{
-			throw new NotImplementedException ();
-		}
-		
 		void Add (TKey key, TValue value)
 		{
 			while (!TryAdd (key, value));
@@ -512,33 +506,10 @@ namespace System.Collections.Concurrent
 			}
 		}
 		
-		[MonoTODO]
-		protected virtual void GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			throw new NotImplementedException ();
-		}
-		
-		[MonoTODO]
-		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
-		{
-			GetObjectData (info, context);
-		}
-		
 		bool ICollection.IsSynchronized {
 			get { return true; }
 		}
 
-		[MonoTODO]
-		protected virtual void OnDeserialization (object sender)
-		{
-			throw new NotImplementedException ();
-		}
-		
-		void IDeserializationCallback.OnDeserialization (object sender)
-		{
-			OnDeserialization (sender);
-		}
-		
 		bool TryGetBasket (TKey key, out Basket basket)
 		{
 			basket = null;
diff --git a/class/corlib/System/LazyExecutionMode.cs b/class/corlib/System/LazyExecutionMode.cs
deleted file mode 100644
index 05a45953bc..0000000000
--- a/class/corlib/System/LazyExecutionMode.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// LazyExecutionMode.cs
-//
-// Authors:
-//  Zoltan Varga (vargaz@gmail.com)
-//
-// Copyright (C) 2009 Novell
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#if NET_4_0
-
-namespace System
-{
-	public enum LazyExecutionMode {
-		NotThreadSafe = 0,
-		AllowMultipleThreadSafeExecution = 1,
-		EnsureSingleThreadSafeExecution = 2
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/class/corlib/corlib.dll.sources b/class/corlib/corlib.dll.sources
index a16fa4778e..4ecbe3b0f3 100644
--- a/class/corlib/corlib.dll.sources
+++ b/class/corlib/corlib.dll.sources
@@ -181,7 +181,6 @@ System/InvalidTimeZoneException.cs
 System/IServiceProvider.cs
 System/KnownTerminals.cs
 System/Lazy.cs
-System/LazyExecutionMode.cs
 System/LoaderOptimization.cs
 System/LoaderOptimizationAttribute.cs
 System/LocalDataStoreSlot.cs
-- 
2.11.4.GIT