ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / common / serv.cpp

diff --git a/icuSources/common/serv.cpp b/icuSources/common/serv.cpp
index 2cddcfe65dcdcf3d4b266d273c111b26fb6e4df8..93ae060b617be26cead9a37684f7bde1fbd1ce83 100644 (file)
--- a/icuSources/common/serv.cpp
+++ b/icuSources/common/serv.cpp
@@ -1,6 +1,6 @@
 /**
 *******************************************************************************
 /**
 *******************************************************************************

-* Copyright (C) 2001-2011, International Business Machines Corporation.
+* Copyright (C) 2001-2014, International Business Machines Corporation.

 * All Rights Reserved.
 *******************************************************************************
 */
 * All Rights Reserved.
 *******************************************************************************
 */


@@ -102,7 +102,7 @@ UnicodeString&
 ICUServiceKey::debug(UnicodeString& result) const 
 {
     debugClass(result);
 ICUServiceKey::debug(UnicodeString& result) const 
 {
     debugClass(result);

-    result.append(" id: ");
+    result.append((UnicodeString)" id: ");

     result.append(_id);
     return result;
 }
     result.append(_id);
     return result;
 }


@@ -110,7 +110,7 @@ ICUServiceKey::debug(UnicodeString& result) const
 UnicodeString& 
 ICUServiceKey::debugClass(UnicodeString& result) const 
 {
 UnicodeString& 
 ICUServiceKey::debugClass(UnicodeString& result) const 
 {

-    return result.append("ICUServiceKey");
+    return result.append((UnicodeString)"ICUServiceKey");

 }
 #endif
 
 }
 #endif
 


@@ -170,17 +170,17 @@ UnicodeString&
 SimpleFactory::debug(UnicodeString& toAppendTo) const 
 {
     debugClass(toAppendTo);
 SimpleFactory::debug(UnicodeString& toAppendTo) const 
 {
     debugClass(toAppendTo);

-    toAppendTo.append(" id: ");
+    toAppendTo.append((UnicodeString)" id: ");

     toAppendTo.append(_id);
     toAppendTo.append(_id);

-    toAppendTo.append(", visible: ");
-    toAppendTo.append(_visible ? "T" : "F");
+    toAppendTo.append((UnicodeString)", visible: ");
+    toAppendTo.append(_visible ? (UnicodeString)"T" : (UnicodeString)"F");

     return toAppendTo;
 }
 
 UnicodeString& 
 SimpleFactory::debugClass(UnicodeString& toAppendTo) const 
 {
     return toAppendTo;
 }
 
 UnicodeString& 
 SimpleFactory::debugClass(UnicodeString& toAppendTo) const 
 {

-    return toAppendTo.append("SimpleFactory");
+    return toAppendTo.append((UnicodeString)"SimpleFactory");

 }
 #endif
 
 }
 #endif
 


@@ -331,7 +331,7 @@ U_CDECL_END
 ******************************************************************
 */
 
 ******************************************************************
 */
 

-static UMTX lock;
+static UMutex lock = U_MUTEX_INITIALIZER;

 
 ICUService::ICUService()
 : name()
 
 ICUService::ICUService()
 : name()


@@ -401,7 +401,7 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, UErrorCode&
 // reentrantly even without knowing the thread.
 class XMutex : public UMemory {
 public:
 // reentrantly even without knowing the thread.
 class XMutex : public UMemory {
 public:

-    inline XMutex(UMTX *mutex, UBool reentering) 
+    inline XMutex(UMutex *mutex, UBool reentering) 

         : fMutex(mutex)
         , fActive(!reentering) 
     {
         : fMutex(mutex)
         , fActive(!reentering) 
     {


@@ -412,7 +412,7 @@ public:
     }
 
 private:
     }
 
 private:

-    UMTX  *fMutex;
+    UMutex  *fMutex;

     UBool fActive;
 };
 
     UBool fActive;
 };
 


@@ -619,7 +619,7 @@ ICUService::getVisibleIDs(UVector& result, const UnicodeString* matchID, UErrorC
         if (map != NULL) {
             ICUServiceKey* fallbackKey = createKey(matchID, status);
 
         if (map != NULL) {
             ICUServiceKey* fallbackKey = createKey(matchID, status);
 

-            for (int32_t pos = -1;;) {
+            for (int32_t pos = UHASH_FIRST;;) {

                 const UHashElement* e = map->nextElement(pos);
                 if (e == NULL) {
                     break;
                 const UHashElement* e = map->nextElement(pos);
                 if (e == NULL) {
                     break;


@@ -761,7 +761,7 @@ ICUService::getDisplayNames(UVector& result,
                 return result;
             }
 
                 return result;
             }
 

-            int32_t pos = -1;
+            int32_t pos = UHASH_FIRST;

             const UHashElement* entry = NULL;
             while ((entry = m->nextElement(pos)) != NULL) {
                 const UnicodeString* id = (const UnicodeString*)entry->key.pointer;
             const UHashElement* entry = NULL;
             while ((entry = m->nextElement(pos)) != NULL) {
                 const UnicodeString* id = (const UnicodeString*)entry->key.pointer;


@@ -788,7 +788,7 @@ ICUService::getDisplayNames(UVector& result,
      * nextElement(pos) will skip the position at pos and begin the iteration
      * at the next position, which in this case will be 0.
      */
      * nextElement(pos) will skip the position at pos and begin the iteration
      * at the next position, which in this case will be 0.
      */

-    int32_t pos = -1; 
+    int32_t pos = UHASH_FIRST; 

     const UHashElement *entry = NULL;
     while ((entry = dnCache->cache.nextElement(pos)) != NULL) {
         const UnicodeString* id = (const UnicodeString*)entry->value.pointer;
     const UHashElement *entry = NULL;
     while ((entry = dnCache->cache.nextElement(pos)) != NULL) {
         const UnicodeString* id = (const UnicodeString*)entry->value.pointer;