| Index: third_party/icu/source/i18n/smpdtfmt.cpp
|
| ===================================================================
|
| --- third_party/icu/source/i18n/smpdtfmt.cpp (revision 74230)
|
| +++ third_party/icu/source/i18n/smpdtfmt.cpp (working copy)
|
| @@ -685,7 +685,7 @@
|
| // show the decimal point, and recognizes integers only when parsing
|
|
|
| fNumberFormat->setGroupingUsed(FALSE);
|
| - DecimalFormat* decfmt = dynamic_cast<DecimalFormat*>(fNumberFormat);
|
| + DecimalFormat* decfmt = CR_DYNAMIC_CAST<DecimalFormat*>(fNumberFormat);
|
| if (decfmt != NULL) {
|
| decfmt->setDecimalSeparatorAlwaysShown(FALSE);
|
| }
|
| @@ -1365,7 +1365,7 @@
|
|
|
| if (U_SUCCESS(status)) {
|
| nf->setGroupingUsed(FALSE);
|
| - DecimalFormat* decfmt = dynamic_cast<DecimalFormat*>(nf);
|
| + DecimalFormat* decfmt = CR_DYNAMIC_CAST<DecimalFormat*>(nf);
|
| if (decfmt != NULL) {
|
| decfmt->setDecimalSeparatorAlwaysShown(FALSE);
|
| }
|
| @@ -2047,10 +2047,10 @@
|
| const TimeZone & tz = cal.getTimeZone();
|
| BasicTimeZone *btz = NULL;
|
|
|
| - if (dynamic_cast<const OlsonTimeZone *>(&tz) != NULL
|
| - || dynamic_cast<const SimpleTimeZone *>(&tz) != NULL
|
| - || dynamic_cast<const RuleBasedTimeZone *>(&tz) != NULL
|
| - || dynamic_cast<const VTimeZone *>(&tz) != NULL) {
|
| + if (CR_DYNAMIC_CAST<const OlsonTimeZone *>(&tz) != NULL
|
| + || CR_DYNAMIC_CAST<const SimpleTimeZone *>(&tz) != NULL
|
| + || CR_DYNAMIC_CAST<const RuleBasedTimeZone *>(&tz) != NULL
|
| + || CR_DYNAMIC_CAST<const VTimeZone *>(&tz) != NULL) {
|
| btz = (BasicTimeZone*)&tz;
|
| }
|
|
|
| @@ -2933,7 +2933,7 @@
|
| NumberFormat *fmt) const {
|
| UnicodeString oldPrefix;
|
| DecimalFormat* df = NULL;
|
| - if (!allowNegative && (df = dynamic_cast<DecimalFormat*>(fmt)) != NULL) {
|
| + if (!allowNegative && (df = CR_DYNAMIC_CAST<DecimalFormat*>(fmt)) != NULL) {
|
| df->getNegativePrefix(oldPrefix);
|
| df->setNegativePrefix(SUPPRESS_NEGATIVE_PREFIX);
|
| }
|
| @@ -3162,7 +3162,7 @@
|
| }
|
|
|
| // get the suffix
|
| - DecimalFormat* decfmt = dynamic_cast<DecimalFormat*>(fNumberFormat);
|
| + DecimalFormat* decfmt = CR_DYNAMIC_CAST<DecimalFormat*>(fNumberFormat);
|
| if (decfmt != NULL) {
|
| if (isNegative) {
|
| suf = decfmt->getNegativeSuffix(suf);
|
|
|