2008-08-04 Jb Evain <jbevain@novell.com>

	* Hashtable.cs: cleanup internal KeyMarker type for NET_2_1.

svn path=/trunk/mcs/; revision=109557

diff --git a/mcs/class/corlib/System.Collections/ChangeLog b/mcs/class/corlib/System.Collections/ChangeLog
index 1f723c7bd89f1472ae3bda65786a8e9e15b69174..6d0a2b6e8b39940e0ebcc70de953fdb0eb2b6f35 100644 (file)
--- a/mcs/class/corlib/System.Collections/ChangeLog
+++ b/mcs/class/corlib/System.Collections/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-04  Jb Evain  <jbevain@novell.com>
+
+       * Hashtable.cs: cleanup internal KeyMarker type for NET_2_1.
+
 2008-08-04  Jb Evain  <jbevain@novell.com>
 
        * ArrayList.cs: introduce a helper method to throw

diff --git a/mcs/class/corlib/System.Collections/Hashtable.cs b/mcs/class/corlib/System.Collections/Hashtable.cs
index c966ea096e80e0afcb1a99ebdf99fc9705648079..89f1c4c3dd15b488dfdda9e6b242547cd597b2a5 100644 (file)
--- a/mcs/class/corlib/System.Collections/Hashtable.cs
+++ b/mcs/class/corlib/System.Collections/Hashtable.cs
@@ -60,11 +60,18 @@ namespace System.Collections {
                }
 
                [Serializable]
-               internal class KeyMarker: IObjectReference
+               internal class KeyMarker
+#if !NET_2_1
+                       : IObjectReference
+#endif
                {
                        public readonly static KeyMarker Removed = new KeyMarker();
+#if !NET_2_1
                        public object GetRealObject (StreamingContext context)
-                       { return KeyMarker.Removed; }
+                       {
+                               return KeyMarker.Removed;
+                       }
+#endif
                }
 
                //