AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4330 HP-UX has a C++ name mangling bug when the namespace version

Browse Source 
changed from 3.3 to 3.4. This runtime linker can work with this change.

X-SVN-Rev: 17888
This commit is contained in:
George Rhoten 2005-06-14 17:14:30 +00:00
parent c0c3b070df
commit dc0129ceea
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/i18n/nfrs.cpp
View File

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1997-2004, International Business Machines
* Copyright (C) 1997-2005, International Business Machines
* Corporation and others. All Rights Reserved.
******************************************************************************
* file name: nfrs.cpp
@ -701,14 +701,14 @@ NFRuleSet::appendRules(UnicodeString& result) const
// followed by the regular rules...
for (uint32_t i = 0; i < rules.size(); i++) {
result.append(gFourSpaces);
rules[i]->appendRuleText(result);
rules[i]->_appendRuleText(result);
result.append(gLineFeed);
}
// followed by the special rules (if they exist)
if (negativeNumberRule) {
result.append(gFourSpaces);
negativeNumberRule->appendRuleText(result);
negativeNumberRule->_appendRuleText(result);
result.append(gLineFeed);
}
@ -716,7 +716,7 @@ NFRuleSet::appendRules(UnicodeString& result) const
for (uint32_t i = 0; i < 3; ++i) {
if (fractionRules[i]) {
result.append(gFourSpaces);
fractionRules[i]->appendRuleText(result);
fractionRules[i]->_appendRuleText(result);
result.append(gLineFeed);
}
}

9
icu4c/source/i18n/nfrule.cpp
View File

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1997-2004, International Business Machines
* Copyright (C) 1997-2005, International Business Machines
* Corporation and others. All Rights Reserved.
******************************************************************************
* file name: nfrule.cpp
@ -29,9 +29,6 @@
U_NAMESPACE_BEGIN
extern const UChar* CSleftBracket;
extern const UChar* CSrightBracket;
NFRule::NFRule(const RuleBasedNumberFormat* _rbnf)
: baseValue((int32_t)0)
, radix(0)
@ -572,7 +569,7 @@ static void util_append64(UnicodeString& result, int64_t n)
}
void
NFRule::appendRuleText(UnicodeString& result) const
NFRule::_appendRuleText(UnicodeString& result) const
{
switch (getType()) {
case kNegativeNumberRule: result.append(gMinusX); break;
@ -766,7 +763,7 @@ NFRule::doParse(const UnicodeString& text,
fprintf(stderr, "doParse %x ", this);
{
UnicodeString rt;
appendRuleText(rt);
_appendRuleText(rt);
dumpUS(stderr, rt);
}

5
icu4c/source/i18n/nfrule.h
View File

@ -1,6 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 1997-2004, International Business Machines Corporation and others. All Rights Reserved.
* Copyright (C) 1997-2005, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@ -71,7 +72,7 @@ public:
UBool shouldRollBack(double number) const;
void appendRuleText(UnicodeString& result) const;
void _appendRuleText(UnicodeString& result) const;
private:
void parseRuleDescriptor(UnicodeString& descriptor, UErrorCode& status);