mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-14 09:21:03 +00:00
ICU-7074 cherry-pick merge for milestone:4.3.2 - r26757 r26759 r26760 r26762 r26764 r26765
X-SVN-Rev: 26767
This commit is contained in:
Steven R. Loomis
parent
fed2240af3
commit
4a22fc2bfb
6 changed files with 1288 additions and 59 deletions
1292
APIChangeReport.html
1292
APIChangeReport.html
File diff suppressed because it is too large
Load diff
|
|
@ -99,8 +99,6 @@
|
|||
#define _UTF32LEData U_ICU_ENTRY_POINT_RENAME(_UTF32LEData)
|
||||
#define _UTF7Data U_ICU_ENTRY_POINT_RENAME(_UTF7Data)
|
||||
#define _UTF8Data U_ICU_ENTRY_POINT_RENAME(_UTF8Data)
|
||||
#define _fini U_ICU_ENTRY_POINT_RENAME(_fini)
|
||||
#define _init U_ICU_ENTRY_POINT_RENAME(_init)
|
||||
#define bms_close U_ICU_ENTRY_POINT_RENAME(bms_close)
|
||||
#define bms_empty U_ICU_ENTRY_POINT_RENAME(bms_empty)
|
||||
#define bms_getData U_ICU_ENTRY_POINT_RENAME(bms_getData)
|
||||
|
|
@ -118,7 +116,6 @@
|
|||
#define deleteStringList U_ICU_ENTRY_POINT_RENAME(deleteStringList)
|
||||
#define deleteUnicodeStringKey U_ICU_ENTRY_POINT_RENAME(deleteUnicodeStringKey)
|
||||
#define dtitvinfHashTableValueComparator U_ICU_ENTRY_POINT_RENAME(dtitvinfHashTableValueComparator)
|
||||
#define hasICUSTDBundle U_ICU_ENTRY_POINT_RENAME(hasICUSTDBundle)
|
||||
#define le_close U_ICU_ENTRY_POINT_RENAME(le_close)
|
||||
#define le_create U_ICU_ENTRY_POINT_RENAME(le_create)
|
||||
#define le_getCharIndices U_ICU_ENTRY_POINT_RENAME(le_getCharIndices)
|
||||
|
|
@ -1823,6 +1820,7 @@
|
|||
#define RegexMatcher U_ICU_ENTRY_POINT_RENAME(RegexMatcher)
|
||||
#define RegexPattern U_ICU_ENTRY_POINT_RENAME(RegexPattern)
|
||||
#define RegexStaticSets U_ICU_ENTRY_POINT_RENAME(RegexStaticSets)
|
||||
#define RegularExpression U_ICU_ENTRY_POINT_RENAME(RegularExpression)
|
||||
#define RelativeDateFormat U_ICU_ENTRY_POINT_RENAME(RelativeDateFormat)
|
||||
#define RemoveTransliterator U_ICU_ENTRY_POINT_RENAME(RemoveTransliterator)
|
||||
#define Replaceable U_ICU_ENTRY_POINT_RENAME(Replaceable)
|
||||
|
|
@ -1920,7 +1918,6 @@
|
|||
#define ULocRuns U_ICU_ENTRY_POINT_RENAME(ULocRuns)
|
||||
#define UMemory U_ICU_ENTRY_POINT_RENAME(UMemory)
|
||||
#define UObject U_ICU_ENTRY_POINT_RENAME(UObject)
|
||||
#define URegularExpression U_ICU_ENTRY_POINT_RENAME(URegularExpression)
|
||||
#define UStack U_ICU_ENTRY_POINT_RENAME(UStack)
|
||||
#define UStringEnumeration U_ICU_ENTRY_POINT_RENAME(UStringEnumeration)
|
||||
#define UVector U_ICU_ENTRY_POINT_RENAME(UVector)
|
||||
|
|
@ -1945,22 +1942,14 @@
|
|||
#define ValueRuns U_ICU_ENTRY_POINT_RENAME(ValueRuns)
|
||||
#define ZSFCache U_ICU_ENTRY_POINT_RENAME(ZSFCache)
|
||||
#define ZSFCacheEntry U_ICU_ENTRY_POINT_RENAME(ZSFCacheEntry)
|
||||
#define ZSFStringPool U_ICU_ENTRY_POINT_RENAME(ZSFStringPool)
|
||||
#define ZSFStringPoolChunk U_ICU_ENTRY_POINT_RENAME(ZSFStringPoolChunk)
|
||||
#define ZoneMeta U_ICU_ENTRY_POINT_RENAME(ZoneMeta)
|
||||
#define ZoneStringFormat U_ICU_ENTRY_POINT_RENAME(ZoneStringFormat)
|
||||
#define ZoneStringInfo U_ICU_ENTRY_POINT_RENAME(ZoneStringInfo)
|
||||
#define ZoneStringSearchResultHandler U_ICU_ENTRY_POINT_RENAME(ZoneStringSearchResultHandler)
|
||||
#define ZoneStrings U_ICU_ENTRY_POINT_RENAME(ZoneStrings)
|
||||
#define addKeyEntry U_ICU_ENTRY_POINT_RENAME(addKeyEntry)
|
||||
#define addString U_ICU_ENTRY_POINT_RENAME(addString)
|
||||
#define build U_ICU_ENTRY_POINT_RENAME(build)
|
||||
#define buildConfusableData U_ICU_ENTRY_POINT_RENAME(buildConfusableData)
|
||||
#define getByIndex U_ICU_ENTRY_POINT_RENAME(getByIndex)
|
||||
#define getKeywordValuesForLocale U_ICU_ENTRY_POINT_RENAME(getKeywordValuesForLocale)
|
||||
#define getMapping U_ICU_ENTRY_POINT_RENAME(getMapping)
|
||||
#define locale_set_default_internal U_ICU_ENTRY_POINT_RENAME(locale_set_default_internal)
|
||||
#define outputData U_ICU_ENTRY_POINT_RENAME(outputData)
|
||||
#define size U_ICU_ENTRY_POINT_RENAME(size)
|
||||
#define sort U_ICU_ENTRY_POINT_RENAME(sort)
|
||||
#define util64_fromDouble U_ICU_ENTRY_POINT_RENAME(util64_fromDouble)
|
||||
#define util64_pow U_ICU_ENTRY_POINT_RENAME(util64_pow)
|
||||
#define util64_tou U_ICU_ENTRY_POINT_RENAME(util64_tou)
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ static UHashtable * NumberingSystem_cache = NULL;
|
|||
static UMTX nscacheMutex = NULL;
|
||||
|
||||
#if !UCONFIG_NO_SERVICE
|
||||
static ICULocaleService* gService = NULL;
|
||||
static U_NAMESPACE_QUALIFIER ICULocaleService* gService = NULL;
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
|
@ -118,7 +118,7 @@ static ICULocaleService* gService = NULL;
|
|||
U_CDECL_BEGIN
|
||||
static void U_CALLCONV
|
||||
deleteNumberingSystem(void *obj) {
|
||||
delete (NumberingSystem *)obj;
|
||||
delete (U_NAMESPACE_QUALIFIER NumberingSystem *)obj;
|
||||
}
|
||||
|
||||
static UBool U_CALLCONV numfmt_cleanup(void) {
|
||||
|
|
|
|||
|
|
@ -615,8 +615,19 @@ public:
|
|||
* @draft ICU 4.4
|
||||
*/
|
||||
UnicodeString& getDisplayName(UBool daylight, EDisplayType style, const Locale& locale, UnicodeString& result) const;
|
||||
|
||||
|
||||
/**
|
||||
* Sets default time zone name style.
|
||||
* @param sytle EDisplayType to set as default
|
||||
* @draft ICU 4.4
|
||||
*/
|
||||
void setDefaultTimeZoneNameStyle(EDisplayType style);
|
||||
|
||||
/**
|
||||
* Get default time zone name style.
|
||||
* @return Default name style for the time zone.
|
||||
* @draft ICU 4.4
|
||||
*/
|
||||
EDisplayType getDefaultTimeZoneNameStyle();
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break
|
||||
#define HOUR (60*60*1000)
|
||||
|
||||
static const UVersionInfo ICU_432 = {4,3,2,0};
|
||||
static const UVersionInfo ICU_433 = {4,3,3,0};
|
||||
|
||||
static const char *const TESTZIDS[] = {
|
||||
"AGT",
|
||||
|
|
@ -775,7 +775,7 @@ TimeZoneRuleTest::TestVTimeZoneRoundTrip(void) {
|
|||
errln("FAIL: error returned while enumerating timezone IDs.");
|
||||
break;
|
||||
}
|
||||
if (!isICUVersionAtLeast(ICU_432)) {
|
||||
if (!isICUVersionAtLeast(ICU_433)) {
|
||||
// See ticket#7008
|
||||
if (*tzid == UnicodeString("Asia/Amman")) {
|
||||
continue;
|
||||
|
|
@ -874,7 +874,7 @@ TimeZoneRuleTest::TestVTimeZoneRoundTripPartial(void) {
|
|||
errln("FAIL: error returned while enumerating timezone IDs.");
|
||||
break;
|
||||
}
|
||||
if (!isICUVersionAtLeast(ICU_432)) {
|
||||
if (!isICUVersionAtLeast(ICU_433)) {
|
||||
// See ticket#7008
|
||||
if (*tzid == UnicodeString("Asia/Amman")) {
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -100,23 +100,12 @@ print HEADER <<"EndOfHeaderComment";
|
|||
|
||||
#if !U_DISABLE_RENAMING
|
||||
|
||||
/* We need the U_ICU_ENTRY_POINT_RENAME definition. There's a default one in unicode/uvernum.h we can use, but we will give
|
||||
/* We need the U_ICU_ENTRY_POINT_RENAME definition. There's a default one in unicode/uvernum.h we can use, but we will give
|
||||
the platform a chance to define it first.
|
||||
Normally (if utypes.h or umachine.h was included first) this will not be necessary as it will already be defined.
|
||||
*/
|
||||
#ifndef U_ICU_ENTRY_POINT_RENAME
|
||||
/**
|
||||
* Are we using platform.h? If so, include platform.h here.
|
||||
* NOTE: this logic was copied from umachine.h and must be kept in sync with it.
|
||||
*/
|
||||
#if defined(U_PALMOS)
|
||||
/* No equivalent platform.h. Was: include "unicode/ppalmos.h" */
|
||||
#elif defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
|
||||
/* No equivalent platform.h. Was: include "unicode/pwin32.h" */
|
||||
#else
|
||||
# include "unicode/platform.h" /* platform.h is 'pure defines' */
|
||||
/* Do not include "unicode/ptypes.h" - ptypes.h contains typedefs and other includes */
|
||||
#endif
|
||||
#include "unicode/umachine.h"
|
||||
#endif
|
||||
|
||||
/* If we still don't have U_ICU_ENTRY_POINT_RENAME use the default. */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue