2005-12-19 Sebastien Pouliot <sebastien@ximian.com>

* Dictionary.cs: Added [Serializable] attribute to both inner Enumerator struct in Key and Value inner collection classes. * EqualityComparer.cs: Added missing IEqualityComparer interface. * List.cs: Added [Serializable] attribute to both inner Enumerator struct. svn path=/trunk/mcs/; revision=54619
baulig · Dec 19, 2005 · b4a30d2 · b4a30d2
1 parent d588ea3
commit b4a30d2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/mcs/class/corlib/System.Collections.Generic/ChangeLog b/mcs/class/corlib/System.Collections.Generic/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-19  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* Dictionary.cs: Added [Serializable] attribute to both inner 
+	Enumerator struct in Key and Value inner collection classes.
+	* EqualityComparer.cs: Added missing IEqualityComparer interface.
+	* List.cs: Added [Serializable] attribute to both inner Enumerator
+	struct.
+
 2005-12-19  Sebastien Pouliot  <sebastien@ximian.com> 
 
 	* Dictionary.cs: Fixed ICollection.CopyTo to use DictionaryEntry. Fixed

diff --git a/mcs/class/corlib/System.Collections.Generic/Dictionary.cs b/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
@@ -652,6 +652,7 @@ object ICollection.SyncRoot {
 				get { return ((ICollection) dictionary).SyncRoot; }
 			}
 
+			[Serializable]
 			public struct Enumerator : IEnumerator<TKey>, IDisposable, IEnumerator {
 				Dictionary<TKey, TValue>.Enumerator host_enumerator;
 
@@ -771,6 +772,7 @@ object ICollection.SyncRoot {
 				get { return ((ICollection) dictionary).SyncRoot; }
 			}
 
+			[Serializable]
 			public struct Enumerator : IEnumerator<TValue>, IDisposable, IEnumerator {
 				Dictionary<TKey, TValue>.Enumerator host_enumerator;
 

diff --git a/mcs/class/corlib/System.Collections.Generic/EqualityComparer.cs b/mcs/class/corlib/System.Collections.Generic/EqualityComparer.cs
@@ -32,7 +32,7 @@
 
 namespace System.Collections.Generic {
 	[Serializable]
-	public abstract class EqualityComparer <T> : IEqualityComparer <T> {
+	public abstract class EqualityComparer <T> : IEqualityComparer, IEqualityComparer <T> {
 
 		static EqualityComparer ()
 		{
@@ -53,6 +53,16 @@ public static EqualityComparer <T> Default {
 				return _default;
 			}
 		}
+
+		int IEqualityComparer.GetHashCode (object obj)
+		{
+			return GetHashCode ((T)obj);
+		}
+
+		bool IEqualityComparer.Equals (object x, object y)
+		{
+			return Equals ((T)x, (T)y);
+		}
 
 		[Serializable]
 		class DefaultComparer : EqualityComparer<T> {

diff --git a/mcs/class/corlib/System.Collections.Generic/List.cs b/mcs/class/corlib/System.Collections.Generic/List.cs
@@ -594,6 +594,7 @@ object IList.this [int index] {
 		}
 #endregion
 
+		[Serializable]
 		public struct Enumerator : IEnumerator <T>, IDisposable {
 			const int NOT_STARTED = -2;