diff options
Diffstat (limited to 'thirdparty/icu4c/common/ucat.cpp')
| -rw-r--r-- | thirdparty/icu4c/common/ucat.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/thirdparty/icu4c/common/ucat.cpp b/thirdparty/icu4c/common/ucat.cpp index dac56eeb5c..2f7fdcd980 100644 --- a/thirdparty/icu4c/common/ucat.cpp +++ b/thirdparty/icu4c/common/ucat.cpp @@ -43,18 +43,18 @@ u_catopen(const char* name, const char* locale, UErrorCode* ec) { U_CAPI void U_EXPORT2 u_catclose(u_nl_catd catd) { - ures_close((UResourceBundle*) catd); /* may be NULL */ + ures_close((UResourceBundle*) catd); /* may be nullptr */ } -U_CAPI const UChar* U_EXPORT2 +U_CAPI const char16_t* U_EXPORT2 u_catgets(u_nl_catd catd, int32_t set_num, int32_t msg_num, - const UChar* s, + const char16_t* s, int32_t* len, UErrorCode* ec) { char key[MAX_KEY_LEN]; - const UChar* result; + const char16_t* result; - if (ec == NULL || U_FAILURE(*ec)) { + if (ec == nullptr || U_FAILURE(*ec)) { goto ERROR; } @@ -69,7 +69,7 @@ u_catgets(u_nl_catd catd, int32_t set_num, int32_t msg_num, ERROR: /* In case of any failure, return s */ - if (len != NULL) { + if (len != nullptr) { *len = u_strlen(s); } return s; |