diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 21:45:51 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 21:45:51 +0000 |
| commit | 5cbeb59475d2d25a86ac936e47c99be86e0a3183 (patch) | |
| tree | b84cfa6aa252b33d133ceb0922061367ca5ac637 /icu4c/source/common/locbased.cpp | |
| parent | eb3451793aaf42870e44281708ccac51c010e837 (diff) | |
| parent | 627758a905bdac685d065ed3de08e628b03b70b4 (diff) | |
| download | icu-5cbeb59475d2d25a86ac936e47c99be86e0a3183.tar.gz | |
Snap for 11784721 from 627758a905bdac685d065ed3de08e628b03b70b4 to build-tools-release
Change-Id: I48be0d30274e0df643635f86bc40c5a9de1e52ad
Diffstat (limited to 'icu4c/source/common/locbased.cpp')
| -rw-r--r-- | icu4c/source/common/locbased.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/icu4c/source/common/locbased.cpp b/icu4c/source/common/locbased.cpp index adcf2f843..832bc3e88 100644 --- a/icu4c/source/common/locbased.cpp +++ b/icu4c/source/common/locbased.cpp @@ -17,7 +17,7 @@ U_NAMESPACE_BEGIN Locale LocaleBased::getLocale(ULocDataLocaleType type, UErrorCode& status) const { const char* id = getLocaleID(type, status); - return Locale((id != 0) ? id : ""); + return Locale(id != nullptr ? id : ""); } const char* LocaleBased::getLocaleID(ULocDataLocaleType type, UErrorCode& status) const { @@ -37,11 +37,11 @@ const char* LocaleBased::getLocaleID(ULocDataLocaleType type, UErrorCode& status } void LocaleBased::setLocaleIDs(const char* validID, const char* actualID) { - if (validID != 0) { + if (validID != nullptr) { uprv_strncpy(valid, validID, ULOC_FULLNAME_CAPACITY); valid[ULOC_FULLNAME_CAPACITY-1] = 0; // always terminate } - if (actualID != 0) { + if (actualID != nullptr) { uprv_strncpy(actual, actualID, ULOC_FULLNAME_CAPACITY); actual[ULOC_FULLNAME_CAPACITY-1] = 0; // always terminate } |