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

ICU-13541 RBBI object layout optimizations, revert failed AIX fix.

Browse Source 
X-SVN-Rev: 41040
This commit is contained in:
Andy Heninger 2018-03-01 19:33:46 +00:00
parent d0c1e8955c
commit 627506cfb1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
icu4c/source/common/rbbi.cpp
View File

@ -65,7 +65,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RuleBasedBreakIterator)
* tables object that is passed in as a parameter. * tables object that is passed in as a parameter.
*/ */
RuleBasedBreakIterator::RuleBasedBreakIterator(RBBIDataHeader* data, UErrorCode &status) RuleBasedBreakIterator::RuleBasedBreakIterator(RBBIDataHeader* data, UErrorCode &status)
: fText(UTEXT_INITIALIZER), fSCharIter(UnicodeString()) : fSCharIter(UnicodeString())
{ {
init(status); init(status);
fData = new RBBIDataWrapper(data, status); // status checked in constructor fData = new RBBIDataWrapper(data, status); // status checked in constructor
@ -83,7 +83,7 @@ RuleBasedBreakIterator::RuleBasedBreakIterator(RBBIDataHeader* data, UErrorCode
RuleBasedBreakIterator::RuleBasedBreakIterator(const uint8_t *compiledRules, RuleBasedBreakIterator::RuleBasedBreakIterator(const uint8_t *compiledRules,
uint32_t ruleLength, uint32_t ruleLength,
UErrorCode &status) UErrorCode &status)
: fText(UTEXT_INITIALIZER), fSCharIter(UnicodeString()) : fSCharIter(UnicodeString())
{ {
init(status); init(status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
@ -114,7 +114,7 @@ RuleBasedBreakIterator::RuleBasedBreakIterator(const uint8_t *compiledRules,
// //
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
RuleBasedBreakIterator::RuleBasedBreakIterator(UDataMemory* udm, UErrorCode &status) RuleBasedBreakIterator::RuleBasedBreakIterator(UDataMemory* udm, UErrorCode &status)
: fText(UTEXT_INITIALIZER), fSCharIter(UnicodeString()) : fSCharIter(UnicodeString())
{ {
init(status); init(status);
fData = new RBBIDataWrapper(udm, status); // status checked in constructor fData = new RBBIDataWrapper(udm, status); // status checked in constructor
@ -135,7 +135,7 @@ RuleBasedBreakIterator::RuleBasedBreakIterator(UDataMemory* udm, UErrorCode &sta
RuleBasedBreakIterator::RuleBasedBreakIterator( const UnicodeString &rules, RuleBasedBreakIterator::RuleBasedBreakIterator( const UnicodeString &rules,
UParseError &parseError, UParseError &parseError,
UErrorCode &status) UErrorCode &status)
: fText(UTEXT_INITIALIZER), fSCharIter(UnicodeString()) : fSCharIter(UnicodeString())
{ {
init(status); init(status);
if (U_FAILURE(status)) {return;} if (U_FAILURE(status)) {return;}
@ -159,7 +159,7 @@ RuleBasedBreakIterator::RuleBasedBreakIterator( const UnicodeString &rules,
// of rules. // of rules.
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
RuleBasedBreakIterator::RuleBasedBreakIterator() RuleBasedBreakIterator::RuleBasedBreakIterator()
: fText(UTEXT_INITIALIZER), fSCharIter(UnicodeString()) : fSCharIter(UnicodeString())
{ {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
init(status); init(status);
@ -174,7 +174,7 @@ RuleBasedBreakIterator::RuleBasedBreakIterator()
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
RuleBasedBreakIterator::RuleBasedBreakIterator(const RuleBasedBreakIterator& other) RuleBasedBreakIterator::RuleBasedBreakIterator(const RuleBasedBreakIterator& other)
: BreakIterator(other), : BreakIterator(other),
fText(UTEXT_INITIALIZER), fSCharIter(UnicodeString()) fSCharIter(UnicodeString())
{ {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
this->init(status); this->init(status);
@ -277,6 +277,7 @@ RuleBasedBreakIterator::operator=(const RuleBasedBreakIterator& that) {
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void RuleBasedBreakIterator::init(UErrorCode &status) { void RuleBasedBreakIterator::init(UErrorCode &status) {
fText = UTEXT_INITIALIZER;
fCharIter = NULL; fCharIter = NULL;
fData = NULL; fData = NULL;
fPosition = 0; fPosition = 0;