aboutsummaryrefslogtreecommitdiff
path: root/i18n/coll.cpp
diff options
context:
space:
mode:
authorclaireho <chinglanho@gmail.com>2012-01-10 17:54:41 -0800
committerclaireho <chinglanho@gmail.com>2012-01-18 10:54:03 -0800
commitb26ce3a7367e4ed2ee7ddddcdc3f3d3377a455c2 (patch)
tree331c54059647ba33c3336893aa693034eaaacd0d /i18n/coll.cpp
parent8b5912e99e754d93020d9ff0eff0a3fe0195ddc7 (diff)
downloadicu4c-b26ce3a7367e4ed2ee7ddddcdc3f3d3377a455c2.tar.gz
Upgrade ICU to 4.8.1.1.
Bug5862596 : Upgrade Android to ICU4.8.1.1. Change-Id: Ic307bf1f364396fad82cb2f696a0ab5c748f43fa
Diffstat (limited to 'i18n/coll.cpp')
-rw-r--r--i18n/coll.cpp28
1 files changed, 21 insertions, 7 deletions
diff --git a/i18n/coll.cpp b/i18n/coll.cpp
index 83c7565a..f044e292 100644
--- a/i18n/coll.cpp
+++ b/i18n/coll.cpp
@@ -1,6 +1,6 @@
/*
******************************************************************************
- * Copyright (C) 1996-2010, International Business Machines Corporation and
+ * Copyright (C) 1996-2011, International Business Machines Corporation and
* others. All Rights Reserved.
******************************************************************************
*/
@@ -833,9 +833,10 @@ Collator::getFunctionalEquivalent(const char* keyword, const Locale& locale,
return Locale::createFromName(loc);
}
-int32_t Collator::getReorderCodes(int32_t *dest,
- int32_t destCapacity,
- UErrorCode& status) const
+int32_t U_EXPORT2
+Collator::getReorderCodes(int32_t* /* dest*/,
+ int32_t /* destCapacity*/,
+ UErrorCode& status) const
{
if (U_SUCCESS(status)) {
status = U_UNSUPPORTED_ERROR;
@@ -843,15 +844,28 @@ int32_t Collator::getReorderCodes(int32_t *dest,
return 0;
}
-void Collator::setReorderCodes(const int32_t *reorderCodes,
- int32_t reorderCodesLength,
- UErrorCode& status)
+void U_EXPORT2
+Collator::setReorderCodes(const int32_t* /* reorderCodes */,
+ int32_t /* reorderCodesLength */,
+ UErrorCode& status)
{
if (U_SUCCESS(status)) {
status = U_UNSUPPORTED_ERROR;
}
}
+int32_t U_EXPORT2
+Collator::getEquivalentReorderCodes(int32_t /* reorderCode */,
+ int32_t* /* dest */,
+ int32_t /* destCapacity */,
+ UErrorCode& status)
+{
+ if (U_SUCCESS(status)) {
+ status = U_UNSUPPORTED_ERROR;
+ }
+ return 0;
+}
+
// UCollator private data members ----------------------------------------
/* This is useless information */