ICU-64260.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / gender.cpp

diff --git a/icuSources/i18n/gender.cpp b/icuSources/i18n/gender.cpp
index be116eda294b329c2c6ce2a7be0616d3f573ba75..b57f009d373a01c8778d2f7cefd73b0b95205caf 100644 (file)
--- a/icuSources/i18n/gender.cpp
+++ b/icuSources/i18n/gender.cpp
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 * Copyright (C) 2008-2013, International Business Machines Corporation and
@@ -30,7 +32,7 @@
 #include "uhash.h"
 
 static UHashtable* gGenderInfoCache = NULL;
-static UMutex gGenderMetaLock = U_MUTEX_INITIALIZER;
+
 static const char* gNeutralStr = "neutral";
 static const char* gMailTaintsStr = "maleTaints";
 static const char* gMixedNeutralStr = "mixedNeutral";
@@ -96,10 +98,11 @@ const GenderInfo* GenderInfo::getInstance(const Locale& locale, UErrorCode& stat
     return NULL;
   }
 
+  static UMutex *gGenderMetaLock = STATIC_NEW(UMutex);
   const GenderInfo* result = NULL;
   const char* key = locale.getName();
   {
-    Mutex lock(&gGenderMetaLock);
+    Mutex lock(gGenderMetaLock);
     result = (const GenderInfo*) uhash_get(gGenderInfoCache, key);
   }
   if (result) {
@@ -115,7 +118,7 @@ const GenderInfo* GenderInfo::getInstance(const Locale& locale, UErrorCode& stat
   // Try to put our GenderInfo object in cache. If there is a race condition,
   // favor the GenderInfo object that is already in the cache.
   {
-    Mutex lock(&gGenderMetaLock);
+    Mutex lock(gGenderMetaLock);
     GenderInfo* temp = (GenderInfo*) uhash_get(gGenderInfoCache, key);
     if (temp) {
       result = temp;