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

ICU-6557 fix more C/C++ function confusion

Browse source 
X-SVN-Rev: 24702
This commit is contained in:
Steven R. Loomis 2008-10-02 20:20:10 +00:00
parent 3f48b31719
commit 09af16f87e
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/common/propsvec.h
View file

@ -84,12 +84,16 @@ upvec_getRow(uint32_t *pv, int32_t rowIndex,
* (Therefore, it starts at 0 increases in increments of the columns value.)
*/
U_CDECL_BEGIN
typedef void U_CALLCONV
UPVecCompactHandler(void *context,
UChar32 start, UChar32 limit,
int32_t rowIndex, uint32_t *row, int32_t columns,
UErrorCode *pErrorCode);
U_CDECL_END
U_CAPI int32_t U_EXPORT2
upvec_compact(uint32_t *pv, UPVecCompactHandler *handler, void *context, UErrorCode *pErrorCode);

5
icu4c/source/common/ucnvsel.cpp
View file

@ -567,6 +567,7 @@ struct Enumerator {
const UConverterSelector* sel;
};
U_CDECL_BEGIN
static void U_CALLCONV
ucnvsel_close_selector_iterator(UEnumeration *enumerator) {
@ -575,6 +576,7 @@ ucnvsel_close_selector_iterator(UEnumeration *enumerator) {
uprv_free(enumerator);
}
static int32_t U_CALLCONV
ucnvsel_count_encodings(UEnumeration *enumerator, UErrorCode *status) {
// check if already failed
@ -617,6 +619,9 @@ static void U_CALLCONV ucnvsel_reset_iterator(UEnumeration* enumerator,
((Enumerator*)(enumerator->context))->cur = 0;
}
U_CDECL_END
static const UEnumeration defaultEncodings = {
NULL,
NULL,

14
icu4c/source/test/intltest/ssearch.cpp
View file

@ -849,6 +849,8 @@ int32_t StringList::size() const
return listSize;
}
U_CAPI static void deleteStringList(void *obj);
class CEToStringsMap
{
public:
@ -861,7 +863,6 @@ public:
private:
static void deleteStringList(void *obj);
void putStringList(int32_t ce, StringList *stringList);
UHashtable *map;
};
@ -906,13 +907,16 @@ void CEToStringsMap::putStringList(int32_t ce, StringList *stringList)
uhash_iput(map, ce, (void *) stringList, &status);
}
void CEToStringsMap::deleteStringList(void *obj)
U_CAPI static void deleteStringList(void *obj)
{
StringList *strings = (StringList *) obj;
delete strings;
}
U_CAPI static void deleteCEList(void *obj);
U_CAPI static void deleteUnicodeStringKey(void *obj);
class StringToCEsMap
{
public:
@ -924,8 +928,6 @@ public:
private:
static void deleteCEList(void *obj);
static void deleteUnicodeStringKey(void *obj);
UHashtable *map;
};
@ -960,14 +962,14 @@ const CEList *StringToCEsMap::get(const UnicodeString *string)
return (const CEList *) uhash_get(map, string);
}
void StringToCEsMap::deleteCEList(void *obj)
U_CAPI static void deleteCEList(void *obj)
{
CEList *list = (CEList *) obj;
delete list;
}
void StringToCEsMap::deleteUnicodeStringKey(void *obj)
U_CAPI static void deleteUnicodeStringKey(void *obj)
{
UnicodeString *key = (UnicodeString *) obj;