[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System Convert.cs,1.12,1.13

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System
In directory subversions:/tmp/cvs-serv10217/runtime/System

Modified Files:
        Convert.cs 
Log Message:


Signature-compatibility fixes.


Index: Convert.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Convert.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Convert.cs  15 Apr 2003 07:27:54 -0000      1.12
--- Convert.cs  23 Apr 2003 23:52:39 -0000      1.13
***************
*** 296,299 ****
--- 296,303 ----
                        }
  #if !ECMA_COMPAT
+       public static byte ToByte(DateTime value)
+                       {
+                               return ((IConvertible)value).ToByte(null);
+                       }
        public static byte ToByte(Object value)
                        {
***************
*** 537,540 ****
--- 541,549 ----
  #if !ECMA_COMPAT
        [CLSCompliant(false)]
+       public static sbyte ToSByte(DateTime value)
+                       {
+                               return ((IConvertible)value).ToSByte(null);
+                       }
+       [CLSCompliant(false)]
        public static sbyte ToSByte(Object value)
                        {
***************
*** 754,757 ****
--- 763,770 ----
                        }
  #if !ECMA_COMPAT
+       public static short ToInt16(DateTime value)
+                       {
+                               return ((IConvertible)value).ToInt16(null);
+                       }
        public static short ToInt16(Object value)
                        {
***************
*** 984,987 ****
--- 997,1005 ----
  #if !ECMA_COMPAT
        [CLSCompliant(false)]
+       public static ushort ToUInt16(DateTime value)
+                       {
+                               return ((IConvertible)value).ToUInt16(null);
+                       }
+       [CLSCompliant(false)]
        public static ushort ToUInt16(Object value)
                        {
***************
*** 1191,1194 ****
--- 1209,1216 ----
                        }
  #if !ECMA_COMPAT
+       public static int ToInt32(DateTime value)
+                       {
+                               return ((IConvertible)value).ToInt32(null);
+                       }
        public static int ToInt32(Object value)
                        {
***************
*** 1421,1424 ****
--- 1443,1451 ----
  #if !ECMA_COMPAT
        [CLSCompliant(false)]
+       public static uint ToUInt32(DateTime value)
+                       {
+                               return ((IConvertible)value).ToUInt32(null);
+                       }
+       [CLSCompliant(false)]
        public static uint ToUInt32(Object value)
                        {
***************
*** 1613,1616 ****
--- 1640,1647 ----
                        }
  #if !ECMA_COMPAT
+       public static long ToInt64(DateTime value)
+                       {
+                               return ((IConvertible)value).ToInt64(null);
+                       }
        public static long ToInt64(Object value)
                        {
***************
*** 1836,1839 ****
--- 1867,1875 ----
  #if !ECMA_COMPAT
        [CLSCompliant(false)]
+       public static ulong ToUInt64(DateTime value)
+                       {
+                               return ((IConvertible)value).ToUInt64(null);
+                       }
+       [CLSCompliant(false)]
        public static ulong ToUInt64(Object value)
                        {
***************
*** 2061,2064 ****
--- 2097,2108 ----
                        }
  #endif
+       public static char ToChar(bool value)
+                       {
+                               return ((IConvertible)value).ToChar(null);
+                       }
+       public static char ToChar(DateTime value)
+                       {
+                               return ((IConvertible)value).ToChar(null);
+                       }
        public static char ToChar(Object value)
                        {
***************
*** 2247,2250 ****
--- 2291,2298 ----
                                }
                        }
+       public static float ToSingle(DateTime value)
+                       {
+                               return ((IConvertible)value).ToSingle(null);
+                       }
  #else // ECMA_COMPAT
        internal static float ToSingle(Object value)
***************
*** 2403,2406 ****
--- 2451,2458 ----
                                }
                        }
+       public static double ToDouble(DateTime value)
+                       {
+                               return ((IConvertible)value).ToDouble(null);
+                       }
  #else // ECMA_COMPAT
        internal static double ToDouble(Object value)
***************
*** 2599,2602 ****
--- 2651,2661 ----
                        }
  #if !ECMA_COMPAT
+       public static String ToString(String value, IFormatProvider provider)
+                       {
+                               return value;
+                       }
+ #endif
+ 
+ #if !ECMA_COMPAT
        // Format an integer in base 10.
        private static String FormatBase10(ulong value, bool isneg)
***************
*** 2707,2746 ****
                                return FormatInBase((long)value, toBase, 8);
                        }
-       [CLSCompliant(false)]
-       public static String ToString(sbyte value, int toBase)
-                       {
-                               return FormatInBase((long)value, toBase, 8);
-                       }
        public static String ToString(short value, int toBase)
                        {
                                return FormatInBase((long)value, toBase, 16);
                        }
-       [CLSCompliant(false)]
-       public static String ToString(ushort value, int toBase)
-                       {
-                               return FormatInBase((long)value, toBase, 16);
-                       }
        public static String ToString(int value, int toBase)
                        {
                                return FormatInBase((long)value, toBase, 32);
                        }
-       [CLSCompliant(false)]
-       public static String ToString(uint value, int toBase)
-                       {
-                               return FormatInBase((long)value, toBase, 32);
-                       }
        public static String ToString(long value, int toBase)
                        {
                                return FormatInBase((long)value, toBase, 64);
                        }
-       [CLSCompliant(false)]
-       public static String ToString(ulong value, int toBase)
-                       {
-                               if(toBase != 10)
-                               {
-                                       return 
FormatInBase(unchecked((long)value), toBase, 64);
-                               }
-                               return FormatBase10(value, false);
-                       }
        public static String ToString(Object value)
                        {
--- 2766,2781 ----
***************
*** 2795,2798 ****
--- 2830,2891 ----
                        }
  #if !ECMA_COMPAT
+       public static DateTime ToDateTime(bool value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       public static DateTime ToDateTime(byte value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       [CLSCompliant(false)]
+       public static DateTime ToDateTime(sbyte value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       public static DateTime ToDateTime(short value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       [CLSCompliant(false)]
+       public static DateTime ToDateTime(ushort value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       public static DateTime ToDateTime(char value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       public static DateTime ToDateTime(int value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       [CLSCompliant(false)]
+       public static DateTime ToDateTime(uint value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       public static DateTime ToDateTime(long value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       [CLSCompliant(false)]
+       public static DateTime ToDateTime(ulong value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+ #if CONFIG_EXTENDED_NUMERICS
+       public static DateTime ToDateTime(float value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       public static DateTime ToDateTime(double value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+       public static DateTime ToDateTime(Decimal value)
+                       {
+                               return ((IConvertible)value).ToDateTime(null);
+                       }
+ #endif
        public static DateTime ToDateTime(Object value)
                        {
***************
*** 2806,2809 ****
--- 2899,2913 ----
                                }
                        }
+       public static DateTime ToDateTime(Object value, IFormatProvider 
provider)
+                       {
+                               if(value != null)
+                               {
+                                       return 
((IConvertible)value).ToDateTime(provider);
+                               }
+                               else
+                               {
+                                       return DateTime.MinValue;
+                               }
+                       }
  #endif // !ECMA_COMPAT
  
***************
*** 2883,2886 ****
--- 2987,3005 ----
                                        return new Decimal(0);
                                }
+                       }
+       public static Decimal ToDecimal(Object value, IFormatProvider provider)
+                       {
+                               if(value != null)
+                               {
+                                       return 
((IConvertible)value).ToDecimal(provider);
+                               }
+                               else
+                               {
+                                       return new Decimal(0);
+                               }
+                       }
+       public static Decimal ToDecimal(DateTime value)
+                       {
+                               return ((IConvertible)value).ToDecimal(null);
                        }
  #else // ECMA_COMPAT