organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-4084 Improve the Calendar instantiation.

Browse source 
Converters/service registration aren't needed by default anymore.

X-SVN-Rev: 16526
This commit is contained in:
George Rhoten 2004-10-17 19:46:59 +00:00
parent 07b125019f
commit 01783a7d6a
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
icu4c/source/i18n/calendar.cpp
View file

@ -342,6 +342,14 @@ public:
// -------------------------------------
static inline UBool
isCalendarServiceUsed() {
Mutex mutex;
return (UBool)(gService != NULL);
}
// -------------------------------------
static ICULocaleService*
getCalendarService(UErrorCode &status)
{
@ -620,7 +628,12 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
{
Locale actualLoc;
UObject* u;
#if UCONFIG_NO_SERVICE
#if !UCONFIG_NO_SERVICE
if (isCalendarServiceUsed()) {
u = getCalendarService(success)->get(aLocale, LocaleKey::KIND_ANY, &actualLoc, success);
}
else
#endif
{
char calLocaleType[ULOC_FULLNAME_CAPACITY] = {"@calendar="};
int32_t calLocaleTypeLen = uprv_strlen(calLocaleType);
@ -648,9 +661,6 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
#endif
u = createStandardCalendar(calLocaleType, aLocale, success);
}
#else
u = getCalendarService(success)->get(aLocale, LocaleKey::KIND_ANY, &actualLoc, success);
#endif
Calendar* c = NULL;
if(U_FAILURE(success) || !u) {