ICU 56 update step 1

source/common/servlkf.cpp

 /**
  *******************************************************************************
- * Copyright (C) 2001-2005, International Business Machines Corporation and    *
+ * Copyright (C) 2001-2014, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  *
  *******************************************************************************
  */
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_SERVICE
 
 #include "unicode/resbund.h"
@@ skipping 50 matching lines @@
         return supported->get(id) != NULL;
     }
     return FALSE;
 }
 
 void
 LocaleKeyFactory::updateVisibleIDs(Hashtable& result, UErrorCode& status) const {
     const Hashtable* supported = getSupportedIDs(status);
     if (supported) {
         UBool visible = (_coverage & 0x1) == 0;
-
         const UHashElement* elem = NULL;
-        int32_t pos = 0;
+        int32_t pos = UHASH_FIRST;
         while ((elem = supported->nextElement(pos)) != NULL) {
             const UnicodeString& id = *((const UnicodeString*)elem->key.pointer);
             if (!visible) {
                 result.remove(id);
             } else {
                 result.put(id, (void*)this, status); // this is dummy non-void marker used for set semantics
                 if (U_FAILURE(status)) {
                     break;
                 }
             }
@@ skipping 33 matching lines @@
 const Hashtable*
 LocaleKeyFactory::getSupportedIDs(UErrorCode& /* status */) const {
     return NULL;
 }
 
 #ifdef SERVICE_DEBUG
 UnicodeString&
 LocaleKeyFactory::debug(UnicodeString& result) const
 {
     debugClass(result);
-    result.append(", name: ");
+    result.append((UnicodeString)", name: ");
     result.append(_name);
-    result.append(", coverage: ");
+    result.append((UnicodeString)", coverage: ");
     result.append(_coverage);
     return result;
 }
 
 UnicodeString&
 LocaleKeyFactory::debugClass(UnicodeString& result) const
 {
-  return result.append("LocaleKeyFactory");
+  return result.append((UnicodeString)"LocaleKeyFactory");
 }
 #endif
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(LocaleKeyFactory)
 
 U_NAMESPACE_END
 
 /* !UCONFIG_NO_SERVICE */
 #endif