Merge pull request #1238 from esdrubal/datetimeoffset

Fixed DateTime compiler errors.

diff --git a/mcs/class/corlib/System/DateTime.cs b/mcs/class/corlib/System/DateTime.cs
index f26cea15cf66df381b9936f686bcd84edc157a97..735599680c52f26706f02cd504f95d55bf76ba60 100644 (file)
--- a/mcs/class/corlib/System/DateTime.cs
+++ b/mcs/class/corlib/System/DateTime.cs
@@ -1722,15 +1722,16 @@ namespace System
                        if (tzsign == -1) {
                                if (result != DateTime.MinValue) {
                                        try {
-                                               TimeSpan offset;
                                                if ((style & DateTimeStyles.AssumeUniversal) != 0) {
-                                                       offset = TimeSpan.Zero;
+                                                       dto = new DateTimeOffset (result, TimeSpan.Zero);
                                                } else if ((style & DateTimeStyles.AssumeLocal) != 0) {
-                                                       offset = use_invariant ?
+                                                       var offset = use_invariant ?
                                                                TimeSpan.Zero :
                                                                TimeZone.CurrentTimeZone.GetUtcOffset (DateTime.Now);
+                                                       dto = new DateTimeOffset (result, offset);
+                                               } else {
+                                                       dto = new DateTimeOffset (result);
                                                }
-                                               dto = new DateTimeOffset (result, offset);
                                        } catch { } // We handle this error in DateTimeOffset.Parse
                                }
                        } else {
@@ -1882,6 +1883,7 @@ namespace System
                                                bool setExceptionOnError, ref Exception exception,
                                                bool dateTimeOffset = false)
                {
+                       dto = new DateTimeOffset (0, TimeSpan.Zero);
                        int i;
                        bool incompleteFormat = false;
                        for (i = 0; i < formats.Length; i++)