Author: robertj
Date: 2007-08-24 20:46:18 -0400 (Fri, 24 Aug 2007)
New Revision: 84839

Modified:
   
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
   
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/CodeGenerator.cs
   
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
   
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
   trunk/mcs/class/corlib/System/ChangeLog
   trunk/mcs/class/corlib/System/DateTime.cs
Log:
In System:
2007-08-25  Robert Jordan  <[EMAIL PROTECTED]>

        * DateTime.cs: Implement internal To/FromBinary for the 1.1 profile.

In System.Runtime.Serialization.Formatters.Binary:
2007-08-25  Robert Jordan  <[EMAIL PROTECTED]>

        * ObjectReader.cs, ObjectWriter.cs, CodeGenerator.cs:
        Use DateTime.From/ToBinary. Fixes #82400.



Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog     2007-08-25 00:19:12 UTC (rev 
84838)
+++ trunk/mcs/class/corlib/System/ChangeLog     2007-08-25 00:46:18 UTC (rev 
84839)
@@ -1,3 +1,7 @@
+2007-08-25  Robert Jordan  <[EMAIL PROTECTED]>
+
+       * DateTime.cs: Implement internal To/FromBinary for the 1.1 profile.
+
 2007-08-24  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * Array.cs: Fix min + max / 2 overflows in the BinarySearch and qsort 
methods.

Modified: trunk/mcs/class/corlib/System/DateTime.cs
===================================================================
--- trunk/mcs/class/corlib/System/DateTime.cs   2007-08-25 00:19:12 UTC (rev 
84838)
+++ trunk/mcs/class/corlib/System/DateTime.cs   2007-08-25 00:46:18 UTC (rev 
84839)
@@ -708,6 +708,18 @@
                }
 #endif
 
+#if ONLY_1_1
+               internal long ToBinary ()
+               {
+                       return Ticks;
+               }
+
+               internal static DateTime FromBinary (long dateData)
+               {
+                       return new DateTime (((dateData << 2) >> 2));
+               }
+#endif
+
                public static int DaysInMonth (int year, int month)
                {
                        int[] days ;

Modified: 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
===================================================================
--- 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog 
    2007-08-25 00:19:12 UTC (rev 84838)
+++ 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog 
    2007-08-25 00:46:18 UTC (rev 84839)
@@ -1,3 +1,8 @@
+2007-08-25  Robert Jordan  <[EMAIL PROTECTED]>
+
+       * ObjectReader.cs, ObjectWriter.cs, CodeGenerator.cs:
+       Use DateTime.From/ToBinary. Fixes #82400.
+
 2007-08-23  Robert Jordan  <[EMAIL PROTECTED]>
 
        * ObjectReader.cs, ObjectReader.cs: Map between System.MonoType[] and

Modified: 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/CodeGenerator.cs
===================================================================
--- 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/CodeGenerator.cs
      2007-08-25 00:19:12 UTC (rev 84838)
+++ 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/CodeGenerator.cs
      2007-08-25 00:46:18 UTC (rev 84839)
@@ -341,7 +341,7 @@
                                        break;
                                        
                                case TypeCode.DateTime: 
-                                       gen.EmitCall (OpCodes.Call, 
typeof(DateTime).GetProperty("Ticks").GetGetMethod(), null);
+                                       gen.EmitCall (OpCodes.Call, 
typeof(DateTime).GetMethod("ToBinary", BindingFlags.Public | 
BindingFlags.NonPublic | BindingFlags.Instance), null);
                                        EmitWrite (gen, typeof(long));
                                        break;
                                        

Modified: 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
===================================================================
--- 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
       2007-08-25 00:19:12 UTC (rev 84838)
+++ 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
       2007-08-25 00:46:18 UTC (rev 84839)
@@ -399,15 +399,7 @@
                                case TypeCode.DateTime: {
                                        DateTime[] arr = new DateTime [length];
                                        for (int n = 0; n < length; n++) {
-                                               ulong nr = reader.ReadUInt64 ();
-                                               const ulong mask = (1ul << 62) 
- 1;
-                                               long ticks = (long) (nr & mask);
-#if NET_2_0
-                                               DateTimeKind kind = 
(DateTimeKind) (nr >> 62);
-                                               arr [n] = new DateTime (ticks, 
kind);
-#else
-                                               arr [n] = new DateTime (ticks);
-#endif
+                                               arr [n] = DateTime.FromBinary 
(reader.ReadInt64 ());
                                        }
                                        val = arr;
                                        break;
@@ -883,7 +875,7 @@
                                        return reader.ReadChar();
 
                                case TypeCode.DateTime: 
-                                       return new DateTime 
(reader.ReadInt64());
+                                       return DateTime.FromBinary 
(reader.ReadInt64());
 
                                case TypeCode.Decimal:
                                        return Decimal.Parse 
(reader.ReadString(), CultureInfo.InvariantCulture);

Modified: 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
===================================================================
--- 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
       2007-08-25 00:19:12 UTC (rev 84838)
+++ 
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
       2007-08-25 00:46:18 UTC (rev 84839)
@@ -559,13 +559,8 @@
                                        break;
 
                                case TypeCode.DateTime: 
-                                       foreach (DateTime item in (DateTime[]) 
array) {
-                                               ulong val = (ulong) item.Ticks;
-#if NET_2_0
-                                               val |= ((ulong) item.Kind) << 
62;
-#endif
-                                               writer.Write (val);
-                                       }
+                                       foreach (DateTime item in (DateTime[]) 
array)
+                                               writer.Write (item.ToBinary ());
                                        break;
 
                                case TypeCode.Decimal:
@@ -849,7 +844,7 @@
                                        break;
 
                                case TypeCode.DateTime: 
-                                       writer.Write ( ((DateTime)value).Ticks);
+                                       writer.Write ( 
((DateTime)value).ToBinary ());
                                        break;
 
                                case TypeCode.Decimal:

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to