Merge pull request #697 from linquize/atom-bug

[mono.git] / mcs / class / corlib / System.Collections / ReadOnlyCollectionBase.cs

diff --git a/mcs/class/corlib/System.Collections/ReadOnlyCollectionBase.cs b/mcs/class/corlib/System.Collections/ReadOnlyCollectionBase.cs
index 14a6643c53f904b1d6a6e20e9462a1c297da99a0..6fbf3b11e46264c681f4f92fb05e1832036d9a94 100644 (file)
--- a/mcs/class/corlib/System.Collections/ReadOnlyCollectionBase.cs
+++ b/mcs/class/corlib/System.Collections/ReadOnlyCollectionBase.cs
@@ -35,9 +35,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Collections {
 
-#if NET_2_0
        [ComVisible(true)]
-#endif
        [Serializable]
        public abstract class ReadOnlyCollectionBase : ICollection, IEnumerable {
 
@@ -45,14 +43,10 @@ namespace System.Collections {
                private ArrayList list;
                
                // public instance properties
-               public
-#if NET_2_0
-               virtual
-#endif         
-               int Count { get { return InnerList.Count; } }
+               public virtual int Count { get { return InnerList.Count; } }
                
                // Public Instance Methods
-               public IEnumerator GetEnumerator() { return InnerList.GetEnumerator(); }
+               public virtual IEnumerator GetEnumerator() { return InnerList.GetEnumerator(); }
                
                // Protected Instance Constructors
                protected ReadOnlyCollectionBase() {
@@ -62,7 +56,9 @@ namespace System.Collections {
                // Protected Instance Properties
                protected ArrayList InnerList {get { return this.list; } }
                
-               // ICollection methods
+               // ICollection/IEnumerable methods
+               IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
+
                void ICollection.CopyTo(Array array, int index) {
                        lock (InnerList) { InnerList.CopyTo(array, index); }
                }