Author: martin
Date: 2005-04-29 05:16:52 -0400 (Fri, 29 Apr 2005)
New Revision: 43778
Modified:
trunk/mcs/class/corlib/System.Collections.Generic/ChangeLog
trunk/mcs/class/corlib/System.Collections.Generic/IEnumerable.cs
trunk/mcs/class/corlib/System.Collections.Generic/IEnumerator.cs
trunk/mcs/class/corlib/System.Collections.Generic/List.cs
Log:
2005-04-29 Martin Baulig <[EMAIL PROTECTED]>
Reflect latest spec changes.
* IEnumerable.cs (IEnumerable<T>): Implement IEnumerable.
* IEnumerator.cs (IEnumerator<T>): Implement IEnumerator.
Modified: trunk/mcs/class/corlib/System.Collections.Generic/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/ChangeLog 2005-04-29
09:09:46 UTC (rev 43777)
+++ trunk/mcs/class/corlib/System.Collections.Generic/ChangeLog 2005-04-29
09:16:52 UTC (rev 43778)
@@ -1,3 +1,10 @@
+2005-04-29 Martin Baulig <[EMAIL PROTECTED]>
+
+ Reflect latest spec changes.
+
+ * IEnumerable.cs (IEnumerable<T>): Implement IEnumerable.
+ * IEnumerator.cs (IEnumerator<T>): Implement IEnumerator.
+
2005-04-29 Raja R Harinath <[EMAIL PROTECTED]>
Remove FIXME.
Modified: trunk/mcs/class/corlib/System.Collections.Generic/IEnumerable.cs
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/IEnumerable.cs
2005-04-29 09:09:46 UTC (rev 43777)
+++ trunk/mcs/class/corlib/System.Collections.Generic/IEnumerable.cs
2005-04-29 09:16:52 UTC (rev 43778)
@@ -39,9 +39,9 @@
{
[CLSCompliant(false)]
[ComVisible(false)]
- public interface IEnumerable<T>
+ public interface IEnumerable<T> : IEnumerable
{
- IEnumerator<T> GetEnumerator ();
+ new IEnumerator<T> GetEnumerator ();
}
}
#endif
Modified: trunk/mcs/class/corlib/System.Collections.Generic/IEnumerator.cs
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/IEnumerator.cs
2005-04-29 09:09:46 UTC (rev 43777)
+++ trunk/mcs/class/corlib/System.Collections.Generic/IEnumerator.cs
2005-04-29 09:16:52 UTC (rev 43778)
@@ -39,11 +39,9 @@
{
[CLSCompliant(false)]
[ComVisible(false)]
- public interface IEnumerator<T> : IDisposable
+ public interface IEnumerator<T> : IDisposable, IEnumerator
{
- bool MoveNext ();
-
- T Current {
+ new T Current {
get;
}
}
Modified: trunk/mcs/class/corlib/System.Collections.Generic/List.cs
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/List.cs 2005-04-29
09:09:46 UTC (rev 43777)
+++ trunk/mcs/class/corlib/System.Collections.Generic/List.cs 2005-04-29
09:16:52 UTC (rev 43778)
@@ -526,6 +526,11 @@
{
return list.GetEnumerator ();
}
+
+ IEnumerator IEnumerable.GetEnumerator ()
+ {
+ return ((IEnumerable) list).GetEnumerator ();
+ }
public int IndexOf (I item)
{
@@ -569,7 +574,7 @@
}
}
- public struct Enumerator : IEnumerator <T>, IEnumerator,
IDisposable {
+ public struct Enumerator : IEnumerator <T>, IDisposable {
const int NOT_STARTED = -2;
// this MUST be -1, because we depend on it in move
next.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
