aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/icu/i18n/formattedvalue.cpp
diff options
context:
space:
mode:
authorromankoshelev <romankoshelev@yandex-team.com>2023-08-09 20:07:20 +0300
committerromankoshelev <romankoshelev@yandex-team.com>2023-08-09 20:59:13 +0300
commitfd82fb12fb45e71a02c628e45b12c50c0dd0d308 (patch)
treef582b79f9002ab1d083e9acda600dfb3551c47b6 /contrib/libs/icu/i18n/formattedvalue.cpp
parentbf862ddf5c6178e1bb5e4fb3f7c61015deebe284 (diff)
downloadydb-fd82fb12fb45e71a02c628e45b12c50c0dd0d308.tar.gz
Update ICU to 70.1
Diffstat (limited to 'contrib/libs/icu/i18n/formattedvalue.cpp')
-rw-r--r--contrib/libs/icu/i18n/formattedvalue.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/libs/icu/i18n/formattedvalue.cpp b/contrib/libs/icu/i18n/formattedvalue.cpp
index e2c9c42fc8..1030661f22 100644
--- a/contrib/libs/icu/i18n/formattedvalue.cpp
+++ b/contrib/libs/icu/i18n/formattedvalue.cpp
@@ -49,7 +49,7 @@ UBool ConstrainedFieldPosition::matchesField(int32_t category, int32_t field) co
case UCFPOS_CONSTRAINT_FIELD:
return fCategory == category && fField == field;
default:
- UPRV_UNREACHABLE;
+ UPRV_UNREACHABLE_EXIT;
}
}
@@ -193,7 +193,7 @@ ucfpos_close(UConstrainedFieldPosition* ptr) {
}
-U_DRAFT const UChar* U_EXPORT2
+U_CAPI const UChar* U_EXPORT2
ufmtval_getString(
const UFormattedValue* ufmtval,
int32_t* pLength,
@@ -209,11 +209,13 @@ ufmtval_getString(
if (pLength != nullptr) {
*pLength = readOnlyAlias.length();
}
+ // Note: this line triggers -Wreturn-local-addr, but it is safe because toTempString is
+ // defined to return memory owned by the ufmtval argument.
return readOnlyAlias.getBuffer();
}
-U_DRAFT UBool U_EXPORT2
+U_CAPI UBool U_EXPORT2
ufmtval_nextPosition(
const UFormattedValue* ufmtval,
UConstrainedFieldPosition* ucfpos,