diff options
author | Steven R. Loomis <srloomis@us.ibm.com> | 2018-02-07 16:42:21 -0800 |
---|---|---|
committer | Steven R. Loomis <srloomis@us.ibm.com> | 2018-02-09 18:09:08 -0800 |
commit | b8f47b27571f8d763f811f017be3fb37d466c4fc (patch) | |
tree | 4101d07d6dd3b2f13a9c9d4423d8a80084214f8c /tools/icu | |
parent | 9b4aa78f720284b5ad43850bbef90400ca010845 (diff) | |
download | android-node-v8-b8f47b27571f8d763f811f017be3fb37d466c4fc.tar.gz android-node-v8-b8f47b27571f8d763f811f017be3fb37d466c4fc.tar.bz2 android-node-v8-b8f47b27571f8d763f811f017be3fb37d466c4fc.zip |
src: add "icu::" prefix before ICU symbols
In ICU 61.x, icu4c will no longer put its declarations in the global namespace.
Everything will be in the "icu::" namespace (or icu_60:: in the linker).
Prepare for this.
https://ssl.icu-project.org/trac/ticket/13460
Diffstat (limited to 'tools/icu')
-rw-r--r-- | tools/icu/iculslocs.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/icu/iculslocs.cc b/tools/icu/iculslocs.cc index ca312b7835..3ceb8d2a4d 100644 --- a/tools/icu/iculslocs.cc +++ b/tools/icu/iculslocs.cc @@ -64,7 +64,7 @@ int VERBOSE = 0; #define RES_INDEX "res_index" #define INSTALLEDLOCALES "InstalledLocales" -CharString packageName; +icu::CharString packageName; const char* locale = RES_INDEX; // locale referring to our index void usage() { @@ -147,7 +147,7 @@ int localeExists(const char* loc, UBool* exists) { if (VERBOSE > 1) { printf("Trying to open %s:%s\n", packageName.data(), loc); } - LocalUResourceBundlePointer aResource( + icu::LocalUResourceBundlePointer aResource( ures_openDirect(packageName.data(), loc, &status)); *exists = FALSE; if (U_SUCCESS(status)) { @@ -189,11 +189,11 @@ void printIndent(FILE* bf, int indent) { * @return 0 for OK, 1 for err */ int dumpAllButInstalledLocales(int lev, - LocalUResourceBundlePointer* bund, + icu::LocalUResourceBundlePointer* bund, FILE* bf, UErrorCode* status) { ures_resetIterator(bund->getAlias()); - LocalUResourceBundlePointer t; + icu::LocalUResourceBundlePointer t; while (U_SUCCESS(*status) && ures_hasNext(bund->getAlias())) { t.adoptInstead(ures_getNextResource(bund->getAlias(), t.orphan(), status)); ASSERT_SUCCESS(status, "while processing table"); @@ -254,10 +254,10 @@ int list(const char* toBundle) { printf("\"locale\": %s\n", locale); } - LocalUResourceBundlePointer bund( + icu::LocalUResourceBundlePointer bund( ures_openDirect(packageName.data(), locale, &status)); ASSERT_SUCCESS(&status, "while opening the bundle"); - LocalUResourceBundlePointer installedLocales( + icu::LocalUResourceBundlePointer installedLocales( // NOLINTNEXTLINE (readability/null_usage) ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, NULL, &status)); ASSERT_SUCCESS(&status, "while fetching installed locales"); @@ -295,7 +295,7 @@ int list(const char* toBundle) { } // OK, now list them. - LocalUResourceBundlePointer subkey; + icu::LocalUResourceBundlePointer subkey; int validCount = 0; for (int32_t i = 0; i < count; i++) { |