From 40d11226ba05117c491157530fa871aefc514842 Mon Sep 17 00:00:00 2001 From: disarray2077 <86157825+disarray2077@users.noreply.github.com> Date: Mon, 21 Jun 2021 17:39:22 -0300 Subject: [PATCH] Fix InvariantInfo --- BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf | 4 +++- BeefLibs/corlib/src/Globalization/GregorianCalendar.bf | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf b/BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf index 72944dfa..abed24a7 100644 --- a/BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf +++ b/BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf @@ -29,7 +29,7 @@ namespace System.Globalization // cache for the invariant culture. // invariantInfo is constant irrespective of your current culture. - private static volatile DateTimeFormatInfo invariantInfo; + private static volatile DateTimeFormatInfo invariantInfo ~ delete _; // an index which points to a record in Culture Data Table. private CultureData m_cultureData; @@ -139,6 +139,8 @@ namespace System.Globalization List ownedObjects = new .() ~ DeleteContainerAndItems!(_); public this() + : this(CultureInfo.InvariantCulture.[Friend]m_cultureData, + GregorianCalendar.[Friend]GetDefaultInstance()) { } diff --git a/BeefLibs/corlib/src/Globalization/GregorianCalendar.bf b/BeefLibs/corlib/src/Globalization/GregorianCalendar.bf index 9b07d146..b6d530b5 100644 --- a/BeefLibs/corlib/src/Globalization/GregorianCalendar.bf +++ b/BeefLibs/corlib/src/Globalization/GregorianCalendar.bf @@ -63,7 +63,7 @@ namespace System.Globalization { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 ) ~ delete _; - private static volatile Calendar s_defaultInstance; + private static volatile Calendar s_defaultInstance ~ delete _; #region Serialization