Merge pull request #350 from robwilkens/bug1089

[mono.git] / mcs / class / System.Data / System.Data.Common / FieldNameLookup.cs

diff --git a/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs b/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs
index 5782bc826579669ead1e2363672848eed311f836..09aa39806b3eb3094b8cf7c95b0d2ef2ae564f28 100644 (file)
--- a/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs
+++ b/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs
@@ -7,16 +7,34 @@
 // Copyright (C) Tim Coleman, 2002
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Collections;
 using System.Data;
 
 namespace System.Data.Common {
-#if NET_1_2
-// FIXME: Need to clean this up
-       public sealed class FieldNameLookup
-#else
        internal sealed class FieldNameLookup : ICollection, IEnumerable
-#endif
        {
                #region Fields
 
@@ -91,12 +109,10 @@ namespace System.Data.Common {
                        list.CopyTo (array, index);
                }
 
-#if ONLY_1_0 || ONLY_1_1
                IEnumerator IEnumerable.GetEnumerator ()
                {
                        return list.GetEnumerator (); 
                }
-#endif
 
                public int IndexOf (object value)
                {