diff options
author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-07-13 04:31:59 +0400 |
---|---|---|
committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-07-13 04:31:59 +0400 |
commit | f79e862f558616ec0bf71f85654e35d69b1c13c5 (patch) | |
tree | 02b4fd326b2c19c7bff9c67af51551faca5f9f45 /mcs/class | |
parent | fc0e187edc97db42019240605614f749bfaefbe1 (diff) |
refix the build
svn path=/branches/mono-2-6/mcs/; revision=160275
Diffstat (limited to 'mcs/class')
-rw-r--r-- | mcs/class/System.Core/System/TimeZoneInfo.cs | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/mcs/class/System.Core/System/TimeZoneInfo.cs b/mcs/class/System.Core/System/TimeZoneInfo.cs index c53d3b992ff..3e946b6d5df 100644 --- a/mcs/class/System.Core/System/TimeZoneInfo.cs +++ b/mcs/class/System.Core/System/TimeZoneInfo.cs @@ -380,7 +380,20 @@ namespace System else ParseRegTzi(adjustmentRules, 1, 9999, reg_tzi); - return CreateCustomTimeZone (id, baseUtcOffset, display_name, standard_name, daylight_name, ValidateRules (adjustmentRules).ToArray ()); + return CreateCustomTimeZone (id, baseUtcOffset, display_name, standard_name, daylight_name, + (AdjustmentRule []) ValidateRules (adjustmentRules).ToArray ()); + } + + static List<AdjustmentRule> ValidateRules (List<AdjustmentRule> adjustmentRules) + { + AdjustmentRule prev = null; + foreach (AdjustmentRule current in adjustmentRules.ToArray ()) { + if (prev != null && prev.DateEnd > current.DateStart) { + adjustmentRules.Remove (current); + } + prev = current; + } + return adjustmentRules; } private static void ParseRegTzi (List<AdjustmentRule> adjustmentRules, int start_year, int end_year, byte [] buffer) @@ -900,18 +913,6 @@ namespace System } } - static List<AdjustmentRule> ValidateRules (List<AdjustmentRule> adjustmentRules) - { - AdjustmentRule prev = null; - foreach (AdjustmentRule current in adjustmentRules.ToArray ()) { - if (prev != null && prev.DateEnd > current.DateStart) { - adjustmentRules.Remove (current); - } - prev = current; - } - return adjustmentRules; - } - static Dictionary<int, string> ParseAbbreviations (byte [] buffer, int index, int count) { var abbrevs = new Dictionary<int, string> (); |