* Assembly/Consts.cs (UnmanageType_80) [BOOTSTRAP_WITH_OLDLIB]: Update to

changed name of bootstrap-only constant.
* System.Runtime.InteropServices/UnmanagedType.cs
(mono_bootstrap_NativeTypeMax): Rename from __mono_bootstrap_NativeTypeMax.
CSC doesn't like [CLSCompliant(false)] on enum member.

svn path=/trunk/mcs/; revision=36535

diff --git a/mcs/class/corlib/Assembly/ChangeLog b/mcs/class/corlib/Assembly/ChangeLog
index b1fba7a9d15deb8668294b0c8eedd74b47600e07..3ec0d91e365de208782f3490633ed44405a67c67 100644 (file)
--- a/mcs/class/corlib/Assembly/ChangeLog
+++ b/mcs/class/corlib/Assembly/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+       * Consts.cs (UnmanageType_80) [BOOTSTRAP_WITH_OLDLIB]: Update to
+       changed name of bootstrap-only constant.
+
 2004-09-08  Miguel de Icaza  <miguel@ximian.com>
 
        * Locale.cs: Added overload that calls String.Format.

diff --git a/mcs/class/corlib/Assembly/Consts.cs b/mcs/class/corlib/Assembly/Consts.cs
index 10122f1071172ac09020febf0557d08acb662fd6..aad837127d5857f360ad1b5ed607137a75e3ac5d 100644 (file)
--- a/mcs/class/corlib/Assembly/Consts.cs
+++ b/mcs/class/corlib/Assembly/Consts.cs
@@ -77,7 +77,7 @@ internal sealed class Consts
 #endif
 
 #if BOOTSTRAP_WITH_OLDLIB
-       public const UnmanagedType UnmanagedType_80 = UnmanagedType.__mono_bootstrap_NativeTypeMax;
+       public const UnmanagedType UnmanagedType_80 = UnmanagedType.mono_bootstrap_NativeTypeMax;
 #else
        public const UnmanagedType UnmanagedType_80 = (UnmanagedType) 80;
 #endif

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
index 4828830499743e22d04664a6028d3883556226e1..3219872c12c9e957730041e80e6c98497741fd43 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+       * UnmanagedType.cs (mono_bootstrap_NativeTypeMax): Rename from
+       __mono_bootstrap_NativeTypeMax.  CSC doesn't like
+       [CLSCompliant(false)] on enum member.
+
 2004-09-30  Zoltan Varga  <vargaz@freemail.hu>
 
        * Marshal.cs: Implement GetDelegateForFunctionPointer.

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs b/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs
index 1b5f3363c241f075a8d3830fdc1a2256c3250975..aa90306c139c76c77aa7faf78e3b2200e49313f3 100755 (executable)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs
@@ -188,8 +188,7 @@ namespace System.Runtime.InteropServices {
 #if BOOTSTRAP_WITH_OLDLIB
                /// <summary>
                /// </summary>
-               [CLSCompliant(false)]
-               __mono_bootstrap_NativeTypeMax = 80,
+               mono_bootstrap_NativeTypeMax = 80,
 #endif
        } // UnmanagedType