Author: martin
Date: 2005-04-29 05:19:47 -0400 (Fri, 29 Apr 2005)
New Revision: 43780
Modified:
trunk/mcs/class/Mono.C5/ChangeLog
trunk/mcs/class/Mono.C5/Collections.cs
trunk/mcs/class/Mono.C5/Makefile
trunk/mcs/class/Mono.C5/Test/SupportClasses.cs
trunk/mcs/class/Mono.C5/Wrappers.cs
trunk/mcs/class/Mono.C5/trees/RedBlackTree.cs
trunk/mcs/class/Mono.C5/trees/RedBlackTreeBag.cs
Log:
2005-04-29 Martin Baulig <[EMAIL PROTECTED]>
Reflect latest API changes.
* Collections.cs (EnumerableBase): Explicitly implement
System.Collections.IEnumerable.GetEnumerator().
* Makefile: Add `nowarn:169'.
Modified: trunk/mcs/class/Mono.C5/ChangeLog
===================================================================
--- trunk/mcs/class/Mono.C5/ChangeLog 2005-04-29 09:17:24 UTC (rev 43779)
+++ trunk/mcs/class/Mono.C5/ChangeLog 2005-04-29 09:19:47 UTC (rev 43780)
@@ -1,3 +1,12 @@
+2005-04-29 Martin Baulig <[EMAIL PROTECTED]>
+
+ Reflect latest API changes.
+
+ * Collections.cs (EnumerableBase): Explicitly implement
+ System.Collections.IEnumerable.GetEnumerator().
+
+ * Makefile: Add `nowarn:169'.
+
2004-11-26 Martin Baulig <[EMAIL PROTECTED]>
* Makefile: Removed `NO_TEST = yes'.
Modified: trunk/mcs/class/Mono.C5/Collections.cs
===================================================================
--- trunk/mcs/class/Mono.C5/Collections.cs 2005-04-29 09:17:24 UTC (rev
43779)
+++ trunk/mcs/class/Mono.C5/Collections.cs 2005-04-29 09:19:47 UTC (rev
43780)
@@ -207,6 +207,11 @@
/// <returns>The enumerator</returns>
public abstract MSG.IEnumerator<T> GetEnumerator();
+ System.Collections.IEnumerator
System.Collections.IEnumerable.GetEnumerator ()
+ {
+ return GetEnumerator ();
+ }
+
/// <summary>
/// Count the number of items in an enumerable by enumeration
/// </summary>
Modified: trunk/mcs/class/Mono.C5/Makefile
===================================================================
--- trunk/mcs/class/Mono.C5/Makefile 2005-04-29 09:17:24 UTC (rev 43779)
+++ trunk/mcs/class/Mono.C5/Makefile 2005-04-29 09:19:47 UTC (rev 43780)
@@ -4,7 +4,7 @@
LIBRARY = Mono.C5.dll
LIBRARY_SNK = c5.snk
-LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
+LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll -nowarn:169
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
EXTRA_DISTFILES = \
Modified: trunk/mcs/class/Mono.C5/Test/SupportClasses.cs
===================================================================
--- trunk/mcs/class/Mono.C5/Test/SupportClasses.cs 2005-04-29 09:17:24 UTC
(rev 43779)
+++ trunk/mcs/class/Mono.C5/Test/SupportClasses.cs 2005-04-29 09:19:47 UTC
(rev 43780)
@@ -24,8 +24,8 @@
using C5;
using NUnit.Framework;
using MSG = System.Collections.Generic;
+using C = System.Collections;
-
namespace nunit
{
using System;
@@ -151,6 +151,11 @@
yield return f(i);
}
+ C.IEnumerator C.IEnumerable.GetEnumerator ()
+ {
+ return GetEnumerator ();
+ }
+
public void Apply(Applier<int> a) { }
}
Modified: trunk/mcs/class/Mono.C5/Wrappers.cs
===================================================================
--- trunk/mcs/class/Mono.C5/Wrappers.cs 2005-04-29 09:17:24 UTC (rev 43779)
+++ trunk/mcs/class/Mono.C5/Wrappers.cs 2005-04-29 09:19:47 UTC (rev 43780)
@@ -23,6 +23,7 @@
using System;
using System.Diagnostics;
using MSG = System.Collections.Generic;
+using SC = System.Collections;
namespace C5
{
/// <summary>
@@ -63,6 +64,15 @@
/// <value>The current item of the wrapped enumerator.</value>
public T Current { get { return enumerator.Current; } }
+ void SC.IEnumerator.Reset ()
+ {
+ enumerator.Reset ();
+ }
+
+ object SC.IEnumerator.Current {
+ get { return enumerator.Current; }
+ }
+
#endregion
#region IDisposable Members
@@ -111,6 +121,9 @@
{ return new GuardedEnumerator<T>(enumerable.GetEnumerator()); }
#endregion
+
+ SC.IEnumerator SC.IEnumerable.GetEnumerator()
+ { return GetEnumerator (); }
}
Modified: trunk/mcs/class/Mono.C5/trees/RedBlackTree.cs
===================================================================
--- trunk/mcs/class/Mono.C5/trees/RedBlackTree.cs 2005-04-29 09:17:24 UTC
(rev 43779)
+++ trunk/mcs/class/Mono.C5/trees/RedBlackTree.cs 2005-04-29 09:19:47 UTC
(rev 43780)
@@ -38,6 +38,7 @@
using System;
using MSG = System.Collections.Generic;
+using SC = System.Collections;
// NOTE NOTE NOTE NOTE
// This source file is used to produce both TreeSet<T> and TreeBag<T>
@@ -541,7 +542,17 @@
}
}
+ void SC.IEnumerator.Reset ()
+ {
+ throw new NotImplementedException ();
+ }
+ object SC.IEnumerator.Current {
+ get {
+ return Current;
+ }
+ }
+
/// <summary>
/// Finalizer for enumeratir
/// </summary>
@@ -654,6 +665,17 @@
#endregion
+ void SC.IEnumerator.Reset ()
+ {
+ throw new NotImplementedException ();
+ }
+
+ object SC.IEnumerator.Current {
+ get {
+ return Current;
+ }
+ }
+
#region IDisposable Members
[Tested]
@@ -3892,7 +3914,17 @@
}
}
+ void SC.IEnumerator.Reset ()
+ {
+ throw new NotImplementedException ();
+ }
+ object SC.IEnumerator.Current {
+ get {
+ return Current;
+ }
+ }
+
[Tested]
public void Dispose()
{
Modified: trunk/mcs/class/Mono.C5/trees/RedBlackTreeBag.cs
===================================================================
--- trunk/mcs/class/Mono.C5/trees/RedBlackTreeBag.cs 2005-04-29 09:17:24 UTC
(rev 43779)
+++ trunk/mcs/class/Mono.C5/trees/RedBlackTreeBag.cs 2005-04-29 09:19:47 UTC
(rev 43780)
@@ -38,6 +38,7 @@
using System;
using MSG = System.Collections.Generic;
+using SC = System.Collections;
// NOTE NOTE NOTE NOTE
// This source file is used to produce both TreeBag<T> and TreeBag<T>
@@ -504,7 +505,17 @@
return valid = true;
}
+ void SC.IEnumerator.Reset ()
+ {
+ throw new NotImplementedException ();
+ }
+ object SC.IEnumerator.Current {
+ get {
+ return Current;
+ }
+ }
+
#region IDisposable Members for Enumerator
bool disposed;
@@ -654,6 +665,17 @@
#endregion
+ void SC.IEnumerator.Reset ()
+ {
+ throw new NotImplementedException ();
+ }
+
+ object SC.IEnumerator.Current {
+ get {
+ return Current;
+ }
+ }
+
#region IDisposable Members
[Tested]
@@ -3892,7 +3914,17 @@
}
}
+ void SC.IEnumerator.Reset ()
+ {
+ throw new NotImplementedException ();
+ }
+ object SC.IEnumerator.Current {
+ get {
+ return Current;
+ }
+ }
+
[Tested]
public void Dispose()
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
