Author: alanmc
Date: 2007-08-24 22:32:55 -0400 (Fri, 24 Aug 2007)
New Revision: 84840
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:
reverted changes for datetime serialization
Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog 2007-08-25 00:46:18 UTC (rev
84839)
+++ trunk/mcs/class/corlib/System/ChangeLog 2007-08-25 02:32:55 UTC (rev
84840)
@@ -1,3 +1,7 @@
+2007-08-25 Alan McGovern <[EMAIL PROTECTED]>
+
+ * DateTime.cs: Reverted DateTime changes.
+
2007-08-25 Robert Jordan <[EMAIL PROTECTED]>
* DateTime.cs: Implement internal To/FromBinary for the 1.1 profile.
Modified: trunk/mcs/class/corlib/System/DateTime.cs
===================================================================
--- trunk/mcs/class/corlib/System/DateTime.cs 2007-08-25 00:46:18 UTC (rev
84839)
+++ trunk/mcs/class/corlib/System/DateTime.cs 2007-08-25 02:32:55 UTC (rev
84840)
@@ -708,18 +708,6 @@
}
#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:46:18 UTC (rev 84839)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
2007-08-25 02:32:55 UTC (rev 84840)
@@ -1,3 +1,8 @@
+2007-08-25 Alan McGovern <[EMAIL PROTECTED]>
+
+ * ObjectReader.cs, ObjectWriter.cs, CodeGenerator.cs:
+ Reverted fix for #82400.
+
2007-08-25 Robert Jordan <[EMAIL PROTECTED]>
* ObjectReader.cs, ObjectWriter.cs, CodeGenerator.cs:
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:46:18 UTC (rev 84839)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/CodeGenerator.cs
2007-08-25 02:32:55 UTC (rev 84840)
@@ -341,7 +341,7 @@
break;
case TypeCode.DateTime:
- gen.EmitCall (OpCodes.Call,
typeof(DateTime).GetMethod("ToBinary", BindingFlags.Public |
BindingFlags.NonPublic | BindingFlags.Instance), null);
+ gen.EmitCall (OpCodes.Call,
typeof(DateTime).GetProperty("Ticks").GetGetMethod(), 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:46:18 UTC (rev 84839)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs
2007-08-25 02:32:55 UTC (rev 84840)
@@ -399,7 +399,15 @@
case TypeCode.DateTime: {
DateTime[] arr = new DateTime [length];
for (int n = 0; n < length; n++) {
- arr [n] = DateTime.FromBinary
(reader.ReadInt64 ());
+ 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
}
val = arr;
break;
@@ -875,7 +883,7 @@
return reader.ReadChar();
case TypeCode.DateTime:
- return DateTime.FromBinary
(reader.ReadInt64());
+ return new DateTime
(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:46:18 UTC (rev 84839)
+++
trunk/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs
2007-08-25 02:32:55 UTC (rev 84840)
@@ -559,8 +559,13 @@
break;
case TypeCode.DateTime:
- foreach (DateTime item in (DateTime[])
array)
- writer.Write (item.ToBinary ());
+ foreach (DateTime item in (DateTime[])
array) {
+ ulong val = (ulong) item.Ticks;
+#if NET_2_0
+ val |= ((ulong) item.Kind) <<
62;
+#endif
+ writer.Write (val);
+ }
break;
case TypeCode.Decimal:
@@ -844,7 +849,7 @@
break;
case TypeCode.DateTime:
- writer.Write (
((DateTime)value).ToBinary ());
+ writer.Write ( ((DateTime)value).Ticks);
break;
case TypeCode.Decimal:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches