organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 17:01:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-8157 commit from branch

Browse source 
X-SVN-Rev: 31439
This commit is contained in:
Steven R. Loomis 2012-02-19 06:39:16 +00:00
parent a69fe19903
commit 5824cdd742
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
icu4c/source/i18n/coll.cpp
View file

@ -888,10 +888,11 @@ Collator::getEquivalentReorderCodes(int32_t /* reorderCode */,
return 0;
}
int32_t U_EXPORT2 Collator::internalGetShortDefinitionString(const char */*locale*/,
int32_t U_EXPORT2
Collator::internalGetShortDefinitionString(const char */*locale*/,
char */*buffer*/,
int32_t /*capacity*/,
UErrorCode &status) {
UErrorCode &status) const {
if(U_SUCCESS(status)) {
status = U_UNSUPPORTED_ERROR; /* Shouldn't happen, internal function */
}

2
icu4c/source/i18n/tblcoll.cpp
View file

@ -765,7 +765,7 @@ RuleBasedCollator::checkOwned() {
int32_t U_EXPORT2 RuleBasedCollator::internalGetShortDefinitionString(const char *locale,
char *buffer,
int32_t capacity,
UErrorCode &status) {
UErrorCode &status) const {
/* simply delegate */
return ucol_getShortDefinitionString(ucollator, locale, buffer, capacity, &status);
}

2
icu4c/source/i18n/unicode/coll.h
View file

@ -1075,7 +1075,7 @@ public:
virtual int32_t internalGetShortDefinitionString(const char *locale,
char *buffer,
int32_t capacity,
UErrorCode &status);
UErrorCode &status) const;
private:
/**

2
icu4c/source/i18n/unicode/tblcoll.h
View file

@ -938,7 +938,7 @@ private:
virtual int32_t internalGetShortDefinitionString(const char *locale,
char *buffer,
int32_t capacity,
UErrorCode &status);
UErrorCode &status) const;
};