ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/common/servlkf.cpp b/icuSources/common/servlkf.cpp
index c455080fdd9d0e2f33dbb60f816e6a36c44fbf2d..8486c2a811d8dae1fdef37553d781ac4a8691c41 100644 (file)
--- a/icuSources/common/servlkf.cpp
+++ b/icuSources/common/servlkf.cpp
@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
 /**
  *******************************************************************************

- * Copyright (C) 2001-2005, International Business Machines Corporation and    *
+ * Copyright (C) 2001-2014, International Business Machines Corporation and    *

  * others. All Rights Reserved.                                                *
  *******************************************************************************
  *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  *


@@ -71,9 +71,8 @@ LocaleKeyFactory::updateVisibleIDs(Hashtable& result, UErrorCode& status) const
     const Hashtable* supported = getSupportedIDs(status);
     if (supported) {
         UBool visible = (_coverage & 0x1) == 0;
     const Hashtable* supported = getSupportedIDs(status);
     if (supported) {
         UBool visible = (_coverage & 0x1) == 0;

-

         const UHashElement* elem = NULL;
         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) {
         while ((elem = supported->nextElement(pos)) != NULL) {
             const UnicodeString& id = *((const UnicodeString*)elem->key.pointer);
             if (!visible) {


@@ -127,9 +126,9 @@ UnicodeString&
 LocaleKeyFactory::debug(UnicodeString& result) const
 {
     debugClass(result);
 LocaleKeyFactory::debug(UnicodeString& result) const
 {
     debugClass(result);

-    result.append(", name: ");
+    result.append((UnicodeString)", name: ");

     result.append(_name);
     result.append(_name);

-    result.append(", coverage: ");
+    result.append((UnicodeString)", coverage: ");

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


@@ -137,7 +136,7 @@ LocaleKeyFactory::debug(UnicodeString& result) const
 UnicodeString&
 LocaleKeyFactory::debugClass(UnicodeString& result) const
 {
 UnicodeString&
 LocaleKeyFactory::debugClass(UnicodeString& result) const
 {

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

 }
 #endif
 
 }
 #endif