ICU 56 update step 1

source/common/serv.cpp

 /**
 *******************************************************************************
-* Copyright (C) 2001-2012, International Business Machines Corporation.
+* Copyright (C) 2001-2014, International Business Machines Corporation.
 * All Rights Reserved.
 *******************************************************************************
 */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_SERVICE
 
 #include "serv.h"
 #include "umutex.h"
@@ skipping 81 matching lines @@
         result.remove(0, n+1);
     }
     return result;
 }
 
 #ifdef SERVICE_DEBUG
 UnicodeString& 
 ICUServiceKey::debug(UnicodeString& result) const 
 {
     debugClass(result);
-    result.append(" id: ");
+    result.append((UnicodeString)" id: ");
     result.append(_id);
     return result;
 }
 
 UnicodeString& 
 ICUServiceKey::debugClass(UnicodeString& result) const 
 {
-    return result.append("ICUServiceKey");
+    return result.append((UnicodeString)"ICUServiceKey");
 }
 #endif
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ICUServiceKey)
 
 /*
 ******************************************************************
 */
 
 ICUServiceFactory::~ICUServiceFactory() {}
@@ skipping 39 matching lines @@
         result.setToBogus();
     }
     return result;
 }
 
 #ifdef SERVICE_DEBUG
 UnicodeString& 
 SimpleFactory::debug(UnicodeString& toAppendTo) const 
 {
     debugClass(toAppendTo);
-    toAppendTo.append(" id: ");
+    toAppendTo.append((UnicodeString)" 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.append("SimpleFactory");
+    return toAppendTo.append((UnicodeString)"SimpleFactory");
 }
 #endif
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SimpleFactory)
 
 /*
 ******************************************************************
 */
 
 ServiceListener::~ServiceListener() {}
@@ skipping 418 matching lines @@
     if (U_FAILURE(status)) {
         return result;
     }
 
     {
         Mutex mutex(&lock);
         const Hashtable* map = getVisibleIDMap(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 UnicodeString* id = (const UnicodeString*)e->key.pointer;
                 if (fallbackKey != NULL) {
                     if (!fallbackKey->isFallbackOf(*id)) {
                         continue;
                     }
@@ skipping 121 matching lines @@
             const Hashtable* m = getVisibleIDMap(status);
             if (U_FAILURE(status)) {
                 return result;
             }
             ncthis->dnCache = new DNCache(locale); 
             if (dnCache == NULL) {
                 status = U_MEMORY_ALLOCATION_ERROR;
                 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;
                 ICUServiceFactory* f = (ICUServiceFactory*)entry->value.pointer;
                 UnicodeString dname;
                 f->getDisplayName(*id, locale, dname);
                 if (dname.isBogus()) {
                     status = U_MEMORY_ALLOCATION_ERROR;
                 } else {
                     dnCache->cache.put(dname, (void*)id, status); // share pointer with visibleIDMap
                     if (U_SUCCESS(status)) {
                         continue;
                     }
                 }
                 delete dnCache;
                 ncthis->dnCache = NULL;
                 return result;
             }
         }
     }
 
     ICUServiceKey* matchKey = createKey(matchID, status);
     /* To ensure that all elements in the hashtable are iterated, set pos to -1.
      * 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;
         if (matchKey != NULL && !matchKey->isFallbackOf(*id)) {
             continue;
         }
         const UnicodeString* dn = (const UnicodeString*)entry->key.pointer;
         StringPair* sp = StringPair::create(*id, *dn, status);
         result.addElement(sp, status);
         if (U_FAILURE(status)) {
@@ skipping 170 matching lines @@
 int32_t
 ICUService::getTimestamp() const
 {
     return timestamp;
 }
 
 U_NAMESPACE_END
 
 /* UCONFIG_NO_SERVICE */
 #endif