Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1434)

Unified Diff: source/common/servlkf.cpp

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/servlk.cpp ('k') | source/common/servnotf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/servlkf.cpp
diff --git a/source/common/servlkf.cpp b/source/common/servlkf.cpp
index c455080fdd9d0e2f33dbb60f816e6a36c44fbf2d..8486c2a811d8dae1fdef37553d781ac4a8691c41 100644
--- a/source/common/servlkf.cpp
+++ b/source/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. *
*******************************************************************************
*
@@ -71,9 +71,8 @@ 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) {
@@ -127,9 +126,9 @@ 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;
}
@@ -137,7 +136,7 @@ LocaleKeyFactory::debug(UnicodeString& result) const
UnicodeString&
LocaleKeyFactory::debugClass(UnicodeString& result) const
{
- return result.append("LocaleKeyFactory");
+ return result.append((UnicodeString)"LocaleKeyFactory");
}
#endif
« no previous file with comments | « source/common/servlk.cpp ('k') | source/common/servnotf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698