diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-07-08 23:06:49 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-07-08 23:06:49 +0400 |
| commit | 24d0a7b0b52a6ccd0a47722bc63d9496af6440d8 (patch) | |
| tree | 4927bc368f67f520140b40be05f10ca66f7365dd /mcs/class | |
| parent | ddd7c3708cc86bad6915c9e426bdbf28c1da4abe (diff) | |
2010-07-08 Gonzalo Paniagua Javier <gonzalo@novell.com>
* DateTime.cs: allow between 1 and 7 digits after the dot.
Fixes bug #594559.
svn path=/branches/mono-2-6/mcs/; revision=160077
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/corlib/System/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/corlib/System/DateTime.cs | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog index 2f7a4448d3f..44ae845d72c 100644 --- a/mcs/class/corlib/System/ChangeLog +++ b/mcs/class/corlib/System/ChangeLog @@ -1,3 +1,8 @@ +2010-07-08 Gonzalo Paniagua Javier <gonzalo@novell.com> + + * DateTime.cs: allow between 1 and 7 digits after the dot. + Fixes bug #594559. + 2010-07-05 Gonzalo Paniagua Javier <gonzalo@novell.com> * TimeSpan.cs: two consecutive colons produce an error now. diff --git a/mcs/class/corlib/System/DateTime.cs b/mcs/class/corlib/System/DateTime.cs index 24d91748017..3fa99dbaeab 100644 --- a/mcs/class/corlib/System/DateTime.cs +++ b/mcs/class/corlib/System/DateTime.cs @@ -116,6 +116,12 @@ namespace System private static readonly string[] ParseTimeFormats = new string [] { "H:m:s.fffffffzzz", "H:m:s.fffffff", + "H:m:s.ffffff", + "H:m:s.fffff", + "H:m:s.ffff", + "H:m:s.fff", + "H:m:s.ff", + "H:m:s.f", "H:m:s tt zzz", "H:m:szzz", "H:m:s", |