2002-10-16 Nick Drochak <ndrochak@gol.com>

	* Enum.cs (Parse): Then fix the code so that it works too.

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

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 80f196240b4078d499746b6e4af7623f57259156..dbd7b7b088ff9cf98e742360d356c57fd146434b 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-16  Nick Drochak  <ndrochak@gol.com>
+
+       * Enum.cs (Parse): Then fix the code so that it works too.
+
 2002-10-15  Nick Drochak  <ndrochak@gol.com>
 
        * Enum.cs (Parse): Use unsigned casts to avoid compiler warnings.

diff --git a/mcs/class/corlib/System/Enum.cs b/mcs/class/corlib/System/Enum.cs
index 38e6cf67af3d8110fd4a5b5cb23838ff1042d459..33d70eb22ca5db745201b0215efb8dd00a25b877 100644 (file)
--- a/mcs/class/corlib/System/Enum.cs
+++ b/mcs/class/corlib/System/Enum.cs
@@ -253,17 +253,17 @@ namespace System {
                                                        case TypeCode.SByte:
                                                                // use the unsigned version in the cast to avoid 
                                                                // compiler warning
-                                                               retVal |= (long)((byte)info.values.GetValue (i));
+                                                               retVal |= (long)((byte)(SByte)info.values.GetValue (i));
                                                                break;
                                                        case TypeCode.Int16:
                                                                // use the unsigned version in the cast to avoid 
                                                                // compiler warning
-                                                               retVal |= (long)((ushort)info.values.GetValue (i));
+                                                               retVal |= (long)((ushort)(short)info.values.GetValue (i));
                                                                break;
                                                        case TypeCode.Int32:
                                                                // use the unsigned version in the cast to avoid 
                                                                // compiler warning
-                                                               retVal |= (long)((uint)info.values.GetValue (i));
+                                                               retVal |= (long)((uint)(int)info.values.GetValue (i));
                                                                break;
                                                        case TypeCode.Int64:
                                                                retVal |= (long)info.values.GetValue (i);