Merge pull request #913 from Daniel15/fix-catchall-routing-master

[mono.git] / mcs / class / corlib / System.Globalization / HebrewCalendar.cs

diff --git a/mcs/class/corlib/System.Globalization/HebrewCalendar.cs b/mcs/class/corlib/System.Globalization/HebrewCalendar.cs
index cf8344796cfbc9e5e7c75b7411f77355fd39066e..54f85203ab592156af00626cca2906c136e666c8 100644 (file)
--- a/mcs/class/corlib/System.Globalization/HebrewCalendar.cs
+++ b/mcs/class/corlib/System.Globalization/HebrewCalendar.cs
@@ -1,4 +1,4 @@
-// HebrewCalendar.cs
+// System.Globalization.HebrewCalendar.cs
 //
 // (C) Ulrich Kunitz 2002
 //
@@ -44,10 +44,7 @@ using System.Runtime.InteropServices;
 /// </para>
 /// </remarks>
 [Serializable]
-#if NET_2_0
-[ComVisible (true)]
-#endif
-[MonoTODO ("Serialization format not compatible with.NET")]
+[MonoLimitation ("Serialization format not compatible with.NET")]
 public class HebrewCalendar : Calendar {
        /// <summary>
        /// Constructor.
@@ -503,12 +500,10 @@ public class HebrewCalendar : Calendar {
                return HebrewEra;
        }
 
-#if NET_2_0
        public override int GetLeapMonth (int year, int era)
        {
                return IsLeapMonth (year, 7, era) ? 7 : 0;
        }
-#endif
 
        /// <summary>
        /// Overridden. Gives the number of the month of the specified
@@ -679,15 +674,15 @@ public class HebrewCalendar : Calendar {
        /// is out of range.
        /// </exception>
        public override DateTime ToDateTime(int year, int month, int day,
-               int hour, int minute, int second, int milliseconds,
+               int hour, int minute, int second, int millisecond,
                int era)
        {
                M_CheckYMDE(year, month, day, ref era);
-               M_CheckHMSM(hour, minute, second, milliseconds);
+               M_CheckHMSM(hour, minute, second, millisecond);
                int ccm = M_CCMonth(month, year);
                int rd = CCHebrewCalendar.fixed_from_dmy(day, ccm, year);
                return CCFixed.ToDateTime(rd,
-                       hour, minute, second, milliseconds);
+                       hour, minute, second, millisecond);
        }
 
        public override int ToFourDigitYear (int year)
@@ -704,12 +699,13 @@ public class HebrewCalendar : Calendar {
                else
                        return baseCentury + year - 100;
        }
-#if NET_2_0
+#if !NET_2_1
        public override CalendarAlgorithmType AlgorithmType {
                get {
                        return CalendarAlgorithmType.LunisolarCalendar;
                }
        }
+#endif
 
        static DateTime Min = new DateTime (1583, 1, 1, 0, 0, 0);
        static DateTime Max = new DateTime (2239, 9, 29, 11, 59, 59);
@@ -725,8 +721,6 @@ public class HebrewCalendar : Calendar {
                        return Max;
                }
        }
-#endif
-
 } // class HebrewCalendar
        
 } // namespace System.Globalization