Author: atsushi
Date: 2007-07-09 05:36:24 -0400 (Mon, 09 Jul 2007)
New Revision: 81623
Modified:
trunk/mcs/class/corlib/System.Globalization/CalendarWeekRule.cs
trunk/mcs/class/corlib/System.Globalization/ChangeLog
trunk/mcs/class/corlib/System.Globalization/CompareOptions.cs
trunk/mcs/class/corlib/System.Globalization/CultureTypes.cs
trunk/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
trunk/mcs/class/corlib/System.Globalization/GregorianCalendarTypes.cs
trunk/mcs/class/corlib/System.Globalization/JapaneseCalendar.cs
trunk/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
trunk/mcs/class/corlib/System.Globalization/TaiwanCalendar.cs
trunk/mcs/class/corlib/System.Globalization/TextInfo.cs
trunk/mcs/class/corlib/System.Globalization/ThaiBuddhistCalendar.cs
trunk/mcs/class/corlib/System.Globalization/UnicodeCategory.cs
Log:
2007-07-09 Atsushi Enomoto <[EMAIL PROTECTED]>
* TextInfo.cs : ICloneable.
* GregorianCalendarTypes.cs CompareOptions.cs CultureTypes.cs
CalendarWeekRule.cs UnicodeCategory.cs : [Serializable].
* ThaiBuddhistCalendar.cs GregorianCalendar.cs KoreanCalendar.cs
TaiwanCalendar.cs JapaneseCalendar.cs :
GetWeekOfYear() (base could be simply used). Removed unused code.
Modified: trunk/mcs/class/corlib/System.Globalization/CalendarWeekRule.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/CalendarWeekRule.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/CalendarWeekRule.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -33,7 +33,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
namespace System.Globalization
{
@@ -42,6 +41,7 @@
/// </summary>
#if NET_2_0
[System.Runtime.InteropServices.ComVisible(true)]
+ [System.Serializable]
#endif
public enum CalendarWeekRule
{
Modified: trunk/mcs/class/corlib/System.Globalization/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/ChangeLog 2007-07-09
09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/ChangeLog 2007-07-09
09:36:24 UTC (rev 81623)
@@ -1,3 +1,12 @@
+2007-07-09 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * TextInfo.cs : ICloneable.
+ * GregorianCalendarTypes.cs CompareOptions.cs CultureTypes.cs
+ CalendarWeekRule.cs UnicodeCategory.cs : [Serializable].
+ * ThaiBuddhistCalendar.cs GregorianCalendar.cs KoreanCalendar.cs
+ TaiwanCalendar.cs JapaneseCalendar.cs :
+ GetWeekOfYear() (base could be simply used). Removed unused code.
+
2007-07-02 Atsushi Enomoto <[EMAIL PROTECTED]>
* UmAlQuraCalendar.cs
Modified: trunk/mcs/class/corlib/System.Globalization/CompareOptions.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/CompareOptions.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/CompareOptions.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -38,6 +38,7 @@
#if NET_2_0
[System.Runtime.InteropServices.ComVisible(true)]
+ [System.Serializable]
#endif
[Flags]
public enum CompareOptions {
Modified: trunk/mcs/class/corlib/System.Globalization/CultureTypes.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/CultureTypes.cs 2007-07-09
09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/CultureTypes.cs 2007-07-09
09:36:24 UTC (rev 81623)
@@ -41,6 +41,7 @@
[Flags]
#if NET_2_0
[System.Runtime.InteropServices.ComVisible(true)]
+ [System.Serializable]
#endif
public enum CultureTypes {
NeutralCultures = 1,
Modified: trunk/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -343,6 +343,13 @@
return 12;
}
+#if NET_2_0
+ public override int GetWeekOfYear (DateTime date, CalendarWeekRule
rule, DayOfWeek firstDayOfWeek)
+ {
+ return base.GetWeekOfYear (date, rule, firstDayOfWeek);
+ }
+#endif
+
/// <summary>
/// Overridden. Gives the number of the year of the specified
/// date.
Modified: trunk/mcs/class/corlib/System.Globalization/GregorianCalendarTypes.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/GregorianCalendarTypes.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/GregorianCalendarTypes.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -38,6 +38,7 @@
#if NET_2_0
[System.Runtime.InteropServices.ComVisible(true)]
+ [System.Serializable]
#endif
public enum GregorianCalendarTypes {
Modified: trunk/mcs/class/corlib/System.Globalization/JapaneseCalendar.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/JapaneseCalendar.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/JapaneseCalendar.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -238,228 +238,8 @@
M_ArgumentInRange("day", day, 1, GetDaysInMonth(year, month,
era));
return gregorianYear;
}
-
-#if false
-
- // Ifdefed out because this is not on the .NET Framewokr.
/// <summary>
- /// Overridden. Adds days to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// days.
- /// </param>
- /// <param name="days">The number of days to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="days"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddDays(DateTime time, int days) {
- DateTime t = base.AddDays(time, days);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Adds hours to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// hours.
- /// </param>
- /// <param name="hours">The number of hours to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="hours"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddHours(DateTime time, int hours) {
- DateTime t = base.AddHours(time, hours);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Adds milliseconds to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// milliseconds.
- /// </param>
- /// <param name="milliseconds">The number of milliseconds given as
- /// double to add. Keep in mind the 100 nanosecond resolution of
- /// <see cref="T:System.DateTime"/>.
- /// </param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="milliseconds"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddMilliseconds(DateTime time,
- double milliseconds)
- {
- DateTime t = base.AddMilliseconds(time, milliseconds);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Adds minutes to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// minutes.
- /// </param>
- /// <param name="minutes">The number of minutes to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="minutes"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddMinutes(DateTime time, int minutes) {
- DateTime t = base.AddMinutes(time, minutes);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Adds seconds to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// seconds.
- /// </param>
- /// <param name="seconds">The number of seconds to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="seconds"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddSeconds(DateTime time, int seconds) {
- DateTime t = base.AddSeconds(time, seconds);
- M_CheckDateTime(t);
- return t;
- }
-
-
- /// <summary>
- /// Overridden. Adds weeks to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// weeks.
- /// </param>
- /// <param name="weeks">The number of weeks to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="weeks"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddWeeks(DateTime time, int weeks) {
- DateTime t = base.AddWeeks(time, weeks);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Gives the hour of the specified time.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> that specifies the
- /// time.
- /// </param>
- /// <returns>An integer that gives the hour of the specified time,
- /// starting with 0.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> parameter is outside all
- /// supported eras.
- /// </exception>
- public override int GetHour(DateTime time) {
- M_CheckDateTime(time);
- return base.GetHour(time);
- }
-
- /// <summary>
- /// Overridden. Gives the milliseconds in the current second
- /// of the specified time.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> that specifies the
- /// time.
- /// </param>
- /// <returns>An integer that gives the milliseconds in the seconds
- /// of the specified time, starting with 0.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> parameter is outside all
- /// supported eras.
- /// </exception>
- public override double GetMilliseconds(DateTime time) {
- M_CheckDateTime(time);
- return base.GetMilliseconds(time);
- }
-
- /// <summary>
- /// Overridden. Gives the minute of the specified time.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> that specifies the
- /// time.
- /// </param>
- /// <returns>An integer that gives the minute of the specified time,
- /// starting with 0.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> parameter is outside all
- /// supported eras.
- /// </exception>
- public override int GetMinute(DateTime time) {
- M_CheckDateTime(time);
- return base.GetMinute(time);
- }
-
- /// <summary>
- /// Overridden. Gives the second of the specified time.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> that specifies the
- /// time.
- /// </param>
- /// <returns>An integer that gives the second of the specified time,
- /// starting with 0.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> parameter is outside all
- /// supported eras.
- /// </exception>
- public override int GetSecond(DateTime time) {
- M_CheckDateTime(time);
- return base.GetMinute(time);
- }
-#endif
-
- /// <summary>
/// Overrideden. Adds months to a given date.
/// </summary>
/// <param name="time">The
@@ -673,6 +453,13 @@
return 12;
}
+#if NET_2_0
+ public override int GetWeekOfYear (DateTime date, CalendarWeekRule
rule, DayOfWeek firstDayOfWeek)
+ {
+ return base.GetWeekOfYear (date, rule, firstDayOfWeek);
+ }
+#endif
+
/// <summary>
/// Overridden. Gives the number of the year of the specified
/// date.
Modified: trunk/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -359,6 +359,13 @@
return 12;
}
+#if NET_2_0
+ public override int GetWeekOfYear (DateTime date, CalendarWeekRule
rule, DayOfWeek firstDayOfWeek)
+ {
+ return base.GetWeekOfYear (date, rule, firstDayOfWeek);
+ }
+#endif
+
/// <summary>
/// Overridden. Gives the number of the year of the specified
/// date.
Modified: trunk/mcs/class/corlib/System.Globalization/TaiwanCalendar.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/TaiwanCalendar.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/TaiwanCalendar.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -205,228 +205,8 @@
GetDaysInMonth(year, month, era));
return gregorianYear;
}
-
-#if false
-
- // Ifdefed out because this is not on the .NET Framework
/// <summary>
- /// Overridden. Adds days to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// days.
- /// </param>
- /// <param name="days">The number of days to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="days"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddDays(DateTime time, int days) {
- DateTime t = base.AddDays(time, days);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Adds hours to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// hours.
- /// </param>
- /// <param name="hours">The number of hours to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="hours"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddHours(DateTime time, int hours) {
- DateTime t = base.AddHours(time, hours);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Adds milliseconds to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// milliseconds.
- /// </param>
- /// <param name="milliseconds">The number of milliseconds given as
- /// double to add. Keep in mind the 100 nanosecond resolution of
- /// <see cref="T:System.DateTime"/>.
- /// </param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="milliseconds"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddMilliseconds(DateTime time,
- double milliseconds)
- {
- DateTime t = base.AddMilliseconds(time, milliseconds);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Adds minutes to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// minutes.
- /// </param>
- /// <param name="minutes">The number of minutes to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="minutes"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddMinutes(DateTime time, int minutes) {
- DateTime t = base.AddMinutes(time, minutes);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Adds seconds to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// seconds.
- /// </param>
- /// <param name="seconds">The number of seconds to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="seconds"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddSeconds(DateTime time, int seconds) {
- DateTime t = base.AddSeconds(time, seconds);
- M_CheckDateTime(t);
- return t;
- }
-
-
- /// <summary>
- /// Overridden. Adds weeks to a given date.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> to which to add
- /// weeks.
- /// </param>
- /// <param name="weeks">The number of weeks to add.</param>
- /// <returns>A new <see cref="T:System.DateTime"/> value, that
- /// results from adding <paramref name="weeks"/> to the specified
- /// DateTime.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> return value is outside all
- /// supported eras.
- /// </exception>
- public override DateTime AddWeeks(DateTime time, int weeks) {
- DateTime t = base.AddWeeks(time, weeks);
- M_CheckDateTime(t);
- return t;
- }
-
- /// <summary>
- /// Overridden. Gives the hour of the specified time.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> that specifies the
- /// time.
- /// </param>
- /// <returns>An integer that gives the hour of the specified time,
- /// starting with 0.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> parameter is outside all
- /// supported eras.
- /// </exception>
- public override int GetHour(DateTime time) {
- M_CheckDateTime(time);
- return base.GetHour(time);
- }
-
- /// <summary>
- /// Overridden. Gives the milliseconds in the current second
- /// of the specified time.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> that specifies the
- /// time.
- /// </param>
- /// <returns>An integer that gives the milliseconds in the seconds
- /// of the specified time, starting with 0.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> parameter is outside all
- /// supported eras.
- /// </exception>
- public override double GetMilliseconds(DateTime time) {
- M_CheckDateTime(time);
- return base.GetMilliseconds(time);
- }
-
- /// <summary>
- /// Overridden. Gives the minute of the specified time.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> that specifies the
- /// time.
- /// </param>
- /// <returns>An integer that gives the minute of the specified time,
- /// starting with 0.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> parameter is outside all
- /// supported eras.
- /// </exception>
- public override int GetMinute(DateTime time) {
- M_CheckDateTime(time);
- return base.GetMinute(time);
- }
-
- /// <summary>
- /// Overridden. Gives the second of the specified time.
- /// </summary>
- /// <param name="time">The
- /// <see cref="T:System.DateTime"/> that specifies the
- /// time.
- /// </param>
- /// <returns>An integer that gives the second of the specified time,
- /// starting with 0.</returns>
- /// <exception cref="T:System.ArgumentOutOfRangeException">
- /// The exception is thrown if the
- /// <see cref="T:System.DateTime"/> parameter is outside all
- /// supported eras.
- /// </exception>
- public override int GetSecond(DateTime time) {
- M_CheckDateTime(time);
- return base.GetMinute(time);
- }
-#endif
-
- /// <summary>
/// Overrideden. Adds months to a given date.
/// </summary>
/// <param name="time">The
@@ -640,6 +420,13 @@
return 12;
}
+#if NET_2_0
+ public override int GetWeekOfYear (DateTime date, CalendarWeekRule
rule, DayOfWeek firstDayOfWeek)
+ {
+ return base.GetWeekOfYear (date, rule, firstDayOfWeek);
+ }
+#endif
+
/// <summary>
/// Overridden. Gives the number of the year of the specified
/// date.
Modified: trunk/mcs/class/corlib/System.Globalization/TextInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/TextInfo.cs 2007-07-09
09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/TextInfo.cs 2007-07-09
09:36:24 UTC (rev 81623)
@@ -45,6 +45,9 @@
[Serializable]
[MonoTODO ("IDeserializationCallback isn't implemented.")]
public class TextInfo: IDeserializationCallback
+#if NET_2_0
+ , ICloneable
+#endif
{
[StructLayout (LayoutKind.Sequential)]
struct Data {
Modified: trunk/mcs/class/corlib/System.Globalization/ThaiBuddhistCalendar.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/ThaiBuddhistCalendar.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/ThaiBuddhistCalendar.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -359,6 +359,13 @@
return 12;
}
+#if NET_2_0
+ public override int GetWeekOfYear (DateTime date, CalendarWeekRule
rule, DayOfWeek firstDayOfWeek)
+ {
+ return base.GetWeekOfYear (date, rule, firstDayOfWeek);
+ }
+#endif
+
/// <summary>
/// Overridden. Gives the number of the year of the specified
/// date.
Modified: trunk/mcs/class/corlib/System.Globalization/UnicodeCategory.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/UnicodeCategory.cs
2007-07-09 09:28:12 UTC (rev 81622)
+++ trunk/mcs/class/corlib/System.Globalization/UnicodeCategory.cs
2007-07-09 09:36:24 UTC (rev 81623)
@@ -35,6 +35,7 @@
#if NET_2_0
[System.Runtime.InteropServices.ComVisible(true)]
+ [System.Serializable]
#endif
public enum UnicodeCategory {
UppercaseLetter = 0,
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
