| Index: third_party/icu/source/i18n/vtzone.cpp
|
| ===================================================================
|
| --- third_party/icu/source/i18n/vtzone.cpp (revision 74230)
|
| +++ third_party/icu/source/i18n/vtzone.cpp (working copy)
|
| @@ -5,7 +5,6 @@
|
| *******************************************************************************
|
| */
|
|
|
| -#include <typeinfo> // for 'typeid' to work
|
|
|
| #include "unicode/utypes.h"
|
|
|
| @@ -1035,7 +1034,7 @@
|
| if (this == &that) {
|
| return TRUE;
|
| }
|
| - if (typeid(*this) != typeid(that) || !BasicTimeZone::operator==(that)) {
|
| + if (CR_TYPEID(*this) != CR_TYPEID(that) || !BasicTimeZone::operator==(that)) {
|
| return FALSE;
|
| }
|
| VTimeZone *vtz = (VTimeZone*)&that;
|
| @@ -1595,7 +1594,7 @@
|
|
|
| for (n = 0; n < rules->size(); n++) {
|
| TimeZoneRule *r = (TimeZoneRule*)rules->elementAt(n);
|
| - AnnualTimeZoneRule *atzrule = dynamic_cast<AnnualTimeZoneRule *>(r);
|
| + AnnualTimeZoneRule *atzrule = CR_DYNAMIC_CAST<AnnualTimeZoneRule *>(r);
|
| if (atzrule != NULL) {
|
| if (atzrule->getEndYear() == AnnualTimeZoneRule::MAX_YEAR) {
|
| finalRuleCount++;
|
| @@ -1956,7 +1955,7 @@
|
| const AnnualTimeZoneRule *atzrule;
|
| if (isDst) {
|
| if (finalDstRule == NULL
|
| - && (atzrule = dynamic_cast<const AnnualTimeZoneRule *>(tzt.getTo())) != NULL
|
| + && (atzrule = CR_DYNAMIC_CAST<const AnnualTimeZoneRule *>(tzt.getTo())) != NULL
|
| && atzrule->getEndYear() == AnnualTimeZoneRule::MAX_YEAR
|
| ) {
|
| finalDstRule = (AnnualTimeZoneRule*)tzt.getTo()->clone();
|
| @@ -2007,7 +2006,7 @@
|
| }
|
| } else {
|
| if (finalStdRule == NULL
|
| - && (atzrule = dynamic_cast<const AnnualTimeZoneRule *>(tzt.getTo())) != NULL
|
| + && (atzrule = CR_DYNAMIC_CAST<const AnnualTimeZoneRule *>(tzt.getTo())) != NULL
|
| && atzrule->getEndYear() == AnnualTimeZoneRule::MAX_YEAR
|
| ) {
|
| finalStdRule = (AnnualTimeZoneRule*)tzt.getTo()->clone();
|
|
|