2005-02-09 Lluis Sanchez Gual <lluis@ximian.com>

	* CultureInfo.cs: Added field needed for serialization
	interoperability with MS.NET. Also fixed default value for
	the constructor.

svn path=/trunk/mcs/; revision=40352

diff --git a/mcs/class/corlib/System.Globalization/ChangeLog b/mcs/class/corlib/System.Globalization/ChangeLog
index b2cd91d3f87eee56750cf2e50e2e8f448e4186f6..044537214231fdf478ad0e5b8d970d583f52698d 100644 (file)
--- a/mcs/class/corlib/System.Globalization/ChangeLog
+++ b/mcs/class/corlib/System.Globalization/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-09  Lluis Sanchez Gual  <lluis@ximian.com>
+
+       * CultureInfo.cs: Added field needed for serialization
+       interoperability with MS.NET. Also fixed default value for
+       the constructor.
+
 2005-01-31  Atsushi Enomoto  <atsushi@ximian.com>
 
        * NumberFormatInfo.cs : allow zero length sizes. patch by Kazuki

diff --git a/mcs/class/corlib/System.Globalization/CultureInfo.cs b/mcs/class/corlib/System.Globalization/CultureInfo.cs
index ed698a3aca8a7304b55abd65dfe33fa5ee2d5627..662904de2b3fa0ee89d0eb9dd36176744e1efa72 100644 (file)
--- a/mcs/class/corlib/System.Globalization/CultureInfo.cs
+++ b/mcs/class/corlib/System.Globalization/CultureInfo.cs
@@ -83,7 +83,8 @@ namespace System.Globalization
                [NonSerialized]
                private Calendar [] optional_calendars;
                                
-               int m_dataItem; // MS.NET serializes this.
+               int m_dataItem;         // MS.NET serializes this.
+               Calendar calendar;      // MS.NET serializes this.
                
                // Deserialized instances will set this to false
                [NonSerialized]
@@ -596,7 +597,7 @@ namespace System.Globalization
                        ConstructCalendars ();
                }
 
-               public CultureInfo (string name) : this (name, false) {}
+               public CultureInfo (string name) : this (name, true) {}
 
                // This is used when creating by specific name and creating by
                // current locale so we can initialize the object without