[dotgnu-pnet-commits] pnetlib ChangeLog runtime/System/Runtime/Compil...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnetlib
Changes by:     Klaus Treichel <ktreichel>      09/01/02 21:07:43

Modified files:
        .              : ChangeLog 
        runtime/System/Runtime/CompilerServices: 
                                                 
CompilationRelaxationsAttribute.cs 
Added files:
        runtime/System/Collections: IEqualityComparer.cs 

Log message:
        Add non ECMA 2.0 interface and enable 1.x features in 
CompilationRelaxationsAttribute.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnetlib/ChangeLog?cvsroot=dotgnu-pnet&r1=1.2547&r2=1.2548
http://cvs.savannah.gnu.org/viewcvs/pnetlib/runtime/System/Collections/IEqualityComparer.cs?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pnetlib/runtime/System/Runtime/CompilerServices/CompilationRelaxationsAttribute.cs?cvsroot=dotgnu-pnet&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.2547
retrieving revision 1.2548
diff -u -b -r1.2547 -r1.2548
--- ChangeLog   16 Dec 2008 13:43:59 -0000      1.2547
+++ ChangeLog   2 Jan 2009 21:07:42 -0000       1.2548
@@ -1,3 +1,11 @@
+2009-01-02  Klaus Treichel  <address@hidden>
+
+       * 
runtime/System/Runtime/CompilerServices/CompilationRelaxationsAttribute.cs:
+       Change conditional compilation so that non ECMA 1.x features are 
available
+       if built with framework_1_x.
+
+       * runtime/System/Collections/IEqualityComparer.cs: Add non ECMA 2.0 
interface.
+
 2008-12-16  Heiko Weiss <address@hidden>
 
        * System.Windows.Forms/ScrollableControl.cs: fix ScrollControlIntoView 
and

Index: 
runtime/System/Runtime/CompilerServices/CompilationRelaxationsAttribute.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/CompilerServices/CompilationRelaxationsAttribute.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- runtime/System/Runtime/CompilerServices/CompilationRelaxationsAttribute.cs  
12 Nov 2007 21:22:19 -0000      1.4
+++ runtime/System/Runtime/CompilerServices/CompilationRelaxationsAttribute.cs  
2 Jan 2009 21:07:43 -0000       1.5
@@ -2,7 +2,7 @@
  * CompilationRelaxationsAttribute.cs - Implementation of the
  *     "System.Runtime.CompilerServices.CompilationRelaxationsAttribute" class.
  *
- * Copyright (C) 2001, 2004  Southern Storm Software, Pty Ltd.
+ * Copyright (C) 2001, 2004, 2009  Southern Storm Software, Pty Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,17 +22,22 @@
 namespace System.Runtime.CompilerServices
 {
 
-#if CONFIG_FRAMEWORK_2_0
+#if !ECMA_COMPAT || CONFIG_FRAMEWORK_2_0
 
+#if CONFIG_FRAMEWORK_2_0
 [AttributeUsage(AttributeTargets.Assembly |
                                AttributeTargets.Class |
                                AttributeTargets.Struct |
                                AttributeTargets.Constructor |
                                AttributeTargets.Method,
                                AllowMultiple=false, Inherited=false)]
+#else
+[AttributeUsage(AttributeTargets.Module)]
+#endif
 public class CompilationRelaxationsAttribute : Attribute
 {
 
+#if CONFIG_FRAMEWORK_2_0
        private const Int32 invalidStringRelaxations = 0x000C;
 
        private const Int32 invalidNullReferenceRelaxations = 0x0030;
@@ -42,10 +47,12 @@
        private const Int32 invalidArrayRelaxations =  0x0300;
 
        private const Int32 invalidOverflowRelaxations = 0x0C00;
+#endif // CONFIG_FRAMEWORK_2_0
 
        // Internal state.
        private int value;
 
+#if CONFIG_FRAMEWORK_2_0
        private void Check(Int32 relaxation)
        {
                if((relaxation & invalidStringRelaxations) ==
@@ -74,19 +81,24 @@
                        throw new ArgumentException();
                }
        }
+#endif // CONFIG_FRAMEWORK_2_0
 
        // Constructors.
        public CompilationRelaxationsAttribute(int relaxations)
                        {
+#if CONFIG_FRAMEWORK_2_0
                                Check(relaxations);
+#endif // CONFIG_FRAMEWORK_2_0
                                value = relaxations;
                        }
 
+#if CONFIG_FRAMEWORK_2_0
        public CompilationRelaxationsAttribute(CompilationRelaxations 
relaxations)
                        {
                                Check((int)relaxations);
                                value = (int)relaxations;
                        }
+#endif // CONFIG_FRAMEWORK_2_0
 
        // Properties.
        public int CompilationRelaxations
@@ -99,6 +111,6 @@
 
 }; // class CompilationRelaxationsAttribute
 
-#endif // !CONFIG_FRAMEWORK_2_0
+#endif // !ECMA_COMPAT || CONFIG_FRAMEWORK_2_0
 
 }; // namespace System.Runtime.CompilerServices

Index: runtime/System/Collections/IEqualityComparer.cs
===================================================================
RCS file: runtime/System/Collections/IEqualityComparer.cs
diff -N runtime/System/Collections/IEqualityComparer.cs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ runtime/System/Collections/IEqualityComparer.cs     2 Jan 2009 21:07:43 
-0000       1.1
@@ -0,0 +1,41 @@
+/*
+ * IEqualityComparer.cs - Implementation of the
+ *             "System.Collections.IEqualityComparer" interface.
+ *
+ * Copyright (C) 2009  Southern Storm Software, Pty Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+namespace System.Collections
+{
+
+#if CONFIG_FRAMEWORK_2_0 && !ECMA_COMPAT
+
+using System;
+using System.Runtime.InteropServices;
+
+[ComVisible(true)]
+public interface IEqualityComparer
+{
+
+       bool Equals(Object x, Object y);
+       int GetHashCode(Object obj);
+
+}; // interface IEqualityComparer
+
+#endif // CONFIG_FRAMEWORK_2_0 && !ECMA_COMPAT
+
+}; // namespace System.Collections