organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6799 fix C++ compilation error due to hash value comparator in decimfmt.h and dtitvinf.h. remove static qualifier. since they are marked as internal, they wont be exposed

Browse source 
X-SVN-Rev: 25812
This commit is contained in:
Xiaomei Ji 2009-04-17 18:52:52 +00:00
parent 643223b7f7
commit 9e2a008374
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
icu4c/source/i18n/decimfmt.cpp
View file

@ -69,17 +69,17 @@ U_CDECL_BEGIN
/**
* @internal ICU 4.2
*/
static UBool U_CALLCONV AffixValueComparator(UHashTok val1, UHashTok val2);
UBool U_CALLCONV decimfmtAffixValueComparator(UHashTok val1, UHashTok val2);
/**
* @internal ICU 4.2
*/
static UBool U_CALLCONV AffixPatternValueComparator(UHashTok val1, UHashTok val2);
UBool U_CALLCONV decimfmtAffixPatternValueComparator(UHashTok val1, UHashTok val2);
U_CDECL_END
UBool
U_CALLCONV AffixValueComparator(UHashTok val1, UHashTok val2) {
U_CALLCONV decimfmtAffixValueComparator(UHashTok val1, UHashTok val2) {
const DecimalFormat::AffixesForCurrency* affix_1 =
(DecimalFormat::AffixesForCurrency*)val1.pointer;
const DecimalFormat::AffixesForCurrency* affix_2 =
@ -92,7 +92,7 @@ U_CALLCONV AffixValueComparator(UHashTok val1, UHashTok val2) {
UBool
U_CALLCONV AffixPatternValueComparator(UHashTok val1, UHashTok val2) {
U_CALLCONV decimfmtAffixPatternValueComparator(UHashTok val1, UHashTok val2) {
const DecimalFormat::AffixPatternsForCurrency* affix_1 =
(DecimalFormat::AffixPatternsForCurrency*)val1.pointer;
const DecimalFormat::AffixPatternsForCurrency* affix_2 =
@ -4449,7 +4449,7 @@ DecimalFormat::initHashForAffix(UErrorCode& status) {
status = U_MEMORY_ALLOCATION_ERROR;
return NULL;
}
hTable->setValueCompartor(AffixValueComparator);
hTable->setValueCompartor(decimfmtAffixValueComparator);
return hTable;
}
@ -4463,7 +4463,7 @@ DecimalFormat::initHashForAffixPattern(UErrorCode& status) {
status = U_MEMORY_ALLOCATION_ERROR;
return NULL;
}
hTable->setValueCompartor(AffixPatternValueComparator);
hTable->setValueCompartor(decimfmtAffixPatternValueComparator);
return hTable;
}

8
icu4c/source/i18n/dtitvinf.cpp
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (C) 2008, International Business Machines Corporation and
* Copyright (C) 2008-2009, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -575,12 +575,12 @@ U_CDECL_BEGIN
* @param val2 the other value in comparison
* @return TRUE if 2 values are the same, FALSE otherwise
*/
static UBool U_CALLCONV hashTableValueComparator(UHashTok val1, UHashTok val2);
UBool U_CALLCONV dtitvinfHashTableValueComparator(UHashTok val1, UHashTok val2);
U_CDECL_END
UBool
U_CALLCONV hashTableValueComparator(UHashTok val1, UHashTok val2) {
U_CALLCONV dtitvinfHashTableValueComparator(UHashTok val1, UHashTok val2) {
const UnicodeString* pattern1 = (UnicodeString*)val1.pointer;
const UnicodeString* pattern2 = (UnicodeString*)val2.pointer;
UBool ret = TRUE;
@ -603,7 +603,7 @@ DateIntervalInfo::initHash(UErrorCode& status) {
status = U_MEMORY_ALLOCATION_ERROR;
return NULL;
}
hTable->setValueCompartor(hashTableValueComparator);
hTable->setValueCompartor(dtitvinfHashTableValueComparator);
return hTable;
}

8
icu4c/source/i18n/unicode/decimfmt.h
View file

@ -45,12 +45,12 @@ U_CDECL_BEGIN
/**
* @internal ICU 4.2
*/
static UBool U_CALLCONV AffixValueComparator(UHashTok val1, UHashTok val2) ;
UBool U_CALLCONV decimfmtAffixValueComparator(UHashTok val1, UHashTok val2) ;
/**
* @internal ICU 4.2
*/
static UBool U_CALLCONV AffixPatternValueComparator(UHashTok val1, UHashTok val2) ;
UBool U_CALLCONV decimfmtAffixPatternValueComparator(UHashTok val1, UHashTok val2) ;
U_CDECL_END
@ -1734,8 +1734,8 @@ public:
virtual UClassID getDynamicClassID(void) const;
private:
friend UBool U_CALLCONV AffixValueComparator(UHashTok val1, UHashTok val2);
friend UBool U_CALLCONV AffixPatternValueComparator(UHashTok val1, UHashTok val2);
friend UBool U_CALLCONV decimfmtAffixValueComparator(UHashTok val1, UHashTok val2);
friend UBool U_CALLCONV decimfmtAffixPatternValueComparator(UHashTok val1, UHashTok val2);
DecimalFormat(); // default constructor not implemented

4
icu4c/source/i18n/unicode/dtitvinf.h
View file

@ -41,7 +41,7 @@ U_CDECL_BEGIN
/**
* @internal ICU 4.0
*/
static UBool U_CALLCONV hashTableValueComparator(UHashTok val1, UHashTok val2) ;
UBool U_CALLCONV dtitvinfHashTableValueComparator(UHashTok val1, UHashTok val2) ;
U_CDECL_END
@ -354,7 +354,7 @@ private:
*/
friend class DateIntervalFormat;
friend UBool U_CALLCONV hashTableValueComparator(UHashTok val1, UHashTok val2) ;
friend UBool U_CALLCONV dtitvinfHashTableValueComparator(UHashTok val1, UHashTok val2) ;
/**
* Following is for saving the interval patterns.