mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-10 07:39:16 +00:00
ICU-45 Fix for z/OS 1.2 and a Solaris warning.
X-SVN-Rev: 8966
This commit is contained in:
parent
fb73b94133
commit
ac12339f9c
3 changed files with 10 additions and 0 deletions
|
@ -44,6 +44,7 @@ RBBIDataWrapper::RBBIDataWrapper(UDataMemory* udm, UErrorCode &status) {
|
|||
// Trie access folding function. Copied as-is from properties code in uchar.c
|
||||
//
|
||||
//-----------------------------------------------------------------------------------
|
||||
U_CDECL_BEGIN
|
||||
static int32_t U_CALLCONV
|
||||
getFoldingOffset(uint32_t data) {
|
||||
/* if bit 15 is set, then the folding offset is in bits 14..0 of the 16-bit trie result */
|
||||
|
@ -53,6 +54,7 @@ getFoldingOffset(uint32_t data) {
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
U_CDECL_END
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
|
|
|
@ -41,7 +41,9 @@ U_NAMESPACE_BEGIN
|
|||
//
|
||||
// Forward Declarations
|
||||
//
|
||||
U_CDECL_BEGIN
|
||||
static void U_EXPORT2 U_CALLCONV RBBISetTable_deleter(void *p);
|
||||
U_CDECL_END
|
||||
|
||||
//----------------------------------------------------------------------------------------
|
||||
//
|
||||
|
@ -623,6 +625,7 @@ void RBBIRuleScanner::fixOpStack(RBBINode::OpPrecedence p) {
|
|||
// If the string is "any", return a set containing all chars.
|
||||
//
|
||||
//----------------------------------------------------------------------------------------
|
||||
U_CDECL_BEGIN
|
||||
static void U_EXPORT2 U_CALLCONV RBBISetTable_deleter(void *p) {
|
||||
RBBISetTableEl *px = (RBBISetTableEl *)p;
|
||||
delete px->key;
|
||||
|
@ -630,6 +633,7 @@ static void U_EXPORT2 U_CALLCONV RBBISetTable_deleter(void *p) {
|
|||
// Don't delete the value nodes here.
|
||||
delete px;
|
||||
};
|
||||
U_CDECL_END
|
||||
|
||||
void RBBIRuleScanner::findSetFor(const UnicodeString &s, RBBINode *node, UnicodeSet *setToAdopt) {
|
||||
|
||||
|
|
|
@ -27,7 +27,9 @@ U_NAMESPACE_BEGIN
|
|||
//
|
||||
// Forward Declarations
|
||||
//
|
||||
U_CDECL_BEGIN
|
||||
static void U_EXPORT2 U_CALLCONV RBBISymbolTableEntry_deleter(void *p);
|
||||
U_CDECL_END
|
||||
|
||||
|
||||
|
||||
|
@ -199,10 +201,12 @@ void RBBISymbolTable::addEntry (const UnicodeString &key, RBBINode *
|
|||
// RBBISymbolTableEntry_deleter Used by the UHashTable to delete the contents
|
||||
// when the hash table is deleted.
|
||||
//
|
||||
U_CDECL_BEGIN
|
||||
static void U_EXPORT2 U_CALLCONV RBBISymbolTableEntry_deleter(void *p) {
|
||||
RBBISymbolTableEntry *px = (RBBISymbolTableEntry *)p;
|
||||
delete px;
|
||||
};
|
||||
U_CDECL_END
|
||||
|
||||
RBBISymbolTableEntry::~RBBISymbolTableEntry() {
|
||||
// The "val" of a symbol table entry is a variable reference node.
|
||||
|
|
Loading…
Add table
Reference in a new issue