Index: source/common/serv.cpp |
diff --git a/source/common/serv.cpp b/source/common/serv.cpp |
index 1a8c9166e043b124b2d753d79f393701fee61533..93ae060b617be26cead9a37684f7bde1fbd1ce83 100644 |
--- a/source/common/serv.cpp |
+++ b/source/common/serv.cpp |
@@ -1,6 +1,6 @@ |
/** |
******************************************************************************* |
-* Copyright (C) 2001-2012, International Business Machines Corporation. |
+* Copyright (C) 2001-2014, International Business Machines Corporation. |
* All Rights Reserved. |
******************************************************************************* |
*/ |
@@ -102,7 +102,7 @@ UnicodeString& |
ICUServiceKey::debug(UnicodeString& result) const |
{ |
debugClass(result); |
- result.append(" id: "); |
+ result.append((UnicodeString)" id: "); |
result.append(_id); |
return result; |
} |
@@ -110,7 +110,7 @@ ICUServiceKey::debug(UnicodeString& result) const |
UnicodeString& |
ICUServiceKey::debugClass(UnicodeString& result) const |
{ |
- return result.append("ICUServiceKey"); |
+ return result.append((UnicodeString)"ICUServiceKey"); |
} |
#endif |
@@ -170,17 +170,17 @@ 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 |
@@ -619,7 +619,7 @@ ICUService::getVisibleIDs(UVector& result, const UnicodeString* matchID, UErrorC |
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; |
@@ -761,7 +761,7 @@ ICUService::getDisplayNames(UVector& 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; |
@@ -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. |
*/ |
- 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; |