ICU-64232.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / intltest.cpp

diff --git a/icuSources/test/intltest/intltest.cpp b/icuSources/test/intltest/intltest.cpp
index e85ba87fca8ee51a2199db44065e434cad48884a..c1b6e5b2e96a26da44d2e48f4c2a90bfb67bb86b 100644 (file)
--- a/icuSources/test/intltest/intltest.cpp
+++ b/icuSources/test/intltest/intltest.cpp
@@ -1109,7 +1109,6 @@ UBool IntlTest::printKnownIssues()
   }
 }
 
   }
 }
 

-static UMutex messageMutex = U_MUTEX_INITIALIZER;

 
 void IntlTest::LL_message( UnicodeString message, UBool newline )
 {
 
 void IntlTest::LL_message( UnicodeString message, UBool newline )
 {


@@ -1117,7 +1116,8 @@ void IntlTest::LL_message( UnicodeString message, UBool newline )
     // All error messages generated by tests funnel through here.
     // Multithreaded tests can concurrently generate errors, requiring synchronization
     // to keep each message together.
     // All error messages generated by tests funnel through here.
     // Multithreaded tests can concurrently generate errors, requiring synchronization
     // to keep each message together.

-    Mutex lock(&messageMutex);
+    static UMutex *messageMutex = STATIC_NEW(UMutex);
+    Mutex lock(messageMutex);

 
     // string that starts with a LineFeed character and continues
     // with spaces according to the current indentation
 
     // string that starts with a LineFeed character and continues
     // with spaces according to the current indentation


@@ -2188,7 +2188,7 @@ void IntlTest::setProperty(const char* propline) {
 const char* IntlTest::getProperty(const char* prop) {
     const char* val = NULL;
     for (int32_t i = 0; i < numProps; i++) {
 const char* IntlTest::getProperty(const char* prop) {
     const char* val = NULL;
     for (int32_t i = 0; i < numProps; i++) {

-        int32_t plen = uprv_strlen(prop);
+        int32_t plen = static_cast<int32_t>(uprv_strlen(prop));

         if ((int32_t)uprv_strlen(proplines[i]) > plen + 1
                 && proplines[i][plen] == '='
                 && uprv_strncmp(proplines[i], prop, plen) == 0) {
         if ((int32_t)uprv_strlen(proplines[i]) > plen + 1
                 && proplines[i][plen] == '='
                 && uprv_strncmp(proplines[i], prop, plen) == 0) {