Commit d190c9a
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/134601 parent 4981e98 commit d190c9a
3 files changed
Lines changed: 13 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -74,11 +74,11 @@ std::string StringViewToUtf8(const StringView& view) { | |||
| 74 | 74 | ||
| 75 | 75 | size_t result_length = view.length() * sizeof(*source); | |
| 76 | 76 | std::string result(result_length, '\0'); | |
| 77 | - UnicodeString utf16(unicodeSource, view.length()); | ||
| 77 | + icu::UnicodeString utf16(unicodeSource, view.length()); | ||
| 78 | 78 | // ICU components for std::string compatibility are not enabled in build... | |
| 79 | 79 | bool done = false; | |
| 80 | 80 | while (!done) { | |
| 81 | - CheckedArrayByteSink sink(&result[0], result_length); | ||
| 81 | + icu::CheckedArrayByteSink sink(&result[0], result_length); | ||
| 82 | 82 | utf16.toUTF8(sink); | |
| 83 | 83 | result_length = sink.NumberOfBytesAppended(); | |
| 84 | 84 | result.resize(result_length); | |
@@ -111,8 +111,9 @@ void ReleasePairOnAsyncClose(uv_handle_t* async) { | |||
| 111 | 111 | } // namespace | |
| 112 | 112 | ||
| 113 | 113 | std::unique_ptr<StringBuffer> Utf8ToStringView(const std::string& message) { | |
| 114 | - UnicodeString utf16 = | ||
| 115 | - UnicodeString::fromUTF8(StringPiece(message.data(), message.length())); | ||
| 114 | + icu::UnicodeString utf16 = | ||
| 115 | + icu::UnicodeString::fromUTF8(icu::StringPiece(message.data(), | ||
| 116 | + message.length())); | ||
| 116 | 117 | StringView view(reinterpret_cast<const uint16_t*>(utf16.getBuffer()), | |
| 117 | 118 | utf16.length()); | |
| 118 | 119 | return StringBuffer::create(view); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -523,7 +523,7 @@ const char* GetVersion(const char* type, | |||
| 523 | 523 | } else if (!strcmp(type, TYPE_UNICODE)) { | |
| 524 | 524 | return U_UNICODE_VERSION; | |
| 525 | 525 | } else if (!strcmp(type, TYPE_TZ)) { | |
| 526 | - return TimeZone::getTZDataVersion(*status); | ||
| 526 | + return icu::TimeZone::getTZDataVersion(*status); | ||
| 527 | 527 | } else if (!strcmp(type, TYPE_CLDR)) { | |
| 528 | 528 | UVersionInfo versionArray; | |
| 529 | 529 | ulocdata_getCLDRVersion(versionArray, status); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -64,7 +64,7 @@ int VERBOSE = 0; | |||
| 64 | 64 | #define RES_INDEX "res_index" | |
| 65 | 65 | #define INSTALLEDLOCALES "InstalledLocales" | |
| 66 | 66 | ||
| 67 | - CharString packageName; | ||
| 67 | + icu::CharString packageName; | ||
| 68 | 68 | const char* locale = RES_INDEX; // locale referring to our index | |
| 69 | 69 | ||
| 70 | 70 | void usage() { | |
@@ -147,7 +147,7 @@ int localeExists(const char* loc, UBool* exists) { | |||
| 147 | 147 | if (VERBOSE > 1) { | |
| 148 | 148 | printf("Trying to open %s:%s\n", packageName.data(), loc); | |
| 149 | 149 | } | |
| 150 | - LocalUResourceBundlePointer aResource( | ||
| 150 | + icu::LocalUResourceBundlePointer aResource( | ||
| 151 | 151 | ures_openDirect(packageName.data(), loc, &status)); | |
| 152 | 152 | *exists = FALSE; | |
| 153 | 153 | if (U_SUCCESS(status)) { | |
@@ -189,11 +189,11 @@ void printIndent(FILE* bf, int indent) { | |||
| 189 | 189 | * @return 0 for OK, 1 for err | |
| 190 | 190 | */ | |
| 191 | 191 | int dumpAllButInstalledLocales(int lev, | |
| 192 | - LocalUResourceBundlePointer* bund, | ||
| 192 | + icu::LocalUResourceBundlePointer* bund, | ||
| 193 | 193 | FILE* bf, | |
| 194 | 194 | UErrorCode* status) { | |
| 195 | 195 | ures_resetIterator(bund->getAlias()); | |
| 196 | - LocalUResourceBundlePointer t; | ||
| 196 | + icu::LocalUResourceBundlePointer t; | ||
| 197 | 197 | while (U_SUCCESS(*status) && ures_hasNext(bund->getAlias())) { | |
| 198 | 198 | t.adoptInstead(ures_getNextResource(bund->getAlias(), t.orphan(), status)); | |
| 199 | 199 | ASSERT_SUCCESS(status, "while processing table"); | |
@@ -254,10 +254,10 @@ int list(const char* toBundle) { | |||
| 254 | 254 | printf("\"locale\": %s\n", locale); | |
| 255 | 255 | } | |
| 256 | 256 | ||
| 257 | - LocalUResourceBundlePointer bund( | ||
| 257 | + icu::LocalUResourceBundlePointer bund( | ||
| 258 | 258 | ures_openDirect(packageName.data(), locale, &status)); | |
| 259 | 259 | ASSERT_SUCCESS(&status, "while opening the bundle"); | |
| 260 | - LocalUResourceBundlePointer installedLocales( | ||
| 260 | + icu::LocalUResourceBundlePointer installedLocales( | ||
| 261 | 261 | // NOLINTNEXTLINE (readability/null_usage) | |
| 262 | 262 | ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, NULL, &status)); | |
| 263 | 263 | ASSERT_SUCCESS(&status, "while fetching installed locales"); | |
@@ -295,7 +295,7 @@ int list(const char* toBundle) { | |||
| 295 | 295 | } | |
| 296 | 296 | ||
| 297 | 297 | // OK, now list them. | |
| 298 | - LocalUResourceBundlePointer subkey; | ||
| 298 | + icu::LocalUResourceBundlePointer subkey; | ||
| 299 | 299 | ||
| 300 | 300 | int validCount = 0; | |
| 301 | 301 | for (int32_t i = 0; i < count; i++) { | |
0 commit comments