organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-5320 Don't use global new and delete, and add a patch for MinGW

Browse source 
X-SVN-Rev: 20064
This commit is contained in:
George Rhoten 2006-08-15 06:47:19 +00:00
parent 5c6df5e87f
commit 3dffeab2e6
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
icu4c/source/i18n/winnmfmt.cpp
View file

@ -137,7 +137,7 @@ Win32NumberFormat::Win32NumberFormat(const Locale &locale, UBool currency, UErro
if (!U_FAILURE(status)) {
fLCID = locale.getLCID();
fFormatInfo = new FormatInfo();
fFormatInfo = (FormatInfo*)uprv_malloc(sizeof(FormatInfo));
if (fCurrency) {
getCurrencyFormat(&fFormatInfo->currency, fLCID);
@ -161,7 +161,7 @@ Win32NumberFormat::~Win32NumberFormat()
freeNumberFormat(&fFormatInfo->number);
}
delete fFormatInfo;
uprv_free(fFormatInfo);
}
Win32NumberFormat &Win32NumberFormat::operator=(const Win32NumberFormat &other)
@ -172,8 +172,13 @@ Win32NumberFormat &Win32NumberFormat::operator=(const Win32NumberFormat &other)
this->fLCID = other.fLCID;
this->fFractionDigitsSet = other.fFractionDigitsSet;
this->fFormatInfo = new FormatInfo;
*this->fFormatInfo = *other.fFormatInfo;
if (fCurrency) {
freeCurrencyFormat(&fFormatInfo->currency);
getCurrencyFormat(&fFormatInfo->currency, fLCID);
} else {
freeNumberFormat(&fFormatInfo->number);
getNumberFormat(&fFormatInfo->number, fLCID);
}
return *this;
}
@ -230,7 +235,7 @@ UnicodeString &Win32NumberFormat::format(int32_t numDigits, UnicodeString &appen
nBuffer[0] = 0x0000;
va_start(args, fmt);
result = vswprintf(nBuffer, STACK_BUFFER_SIZE, fmt, args);
result = _vsnwprintf(nBuffer, STACK_BUFFER_SIZE, fmt, args);
va_end(args);
if (result < 0) {
@ -243,7 +248,7 @@ UnicodeString &Win32NumberFormat::format(int32_t numDigits, UnicodeString &appen
nBuffer = NEW_ARRAY(UChar, newLength + 1);
va_start(args, fmt);
result = vswprintf(nBuffer, newLength + 1, fmt, args);
result = _vsnwprintf(nBuffer, newLength + 1, fmt, args);
va_end(args);
}