| Index: third_party/icu/source/i18n/rbtz.cpp
|
| ===================================================================
|
| --- third_party/icu/source/i18n/rbtz.cpp (revision 74230)
|
| +++ third_party/icu/source/i18n/rbtz.cpp (working copy)
|
| @@ -5,7 +5,6 @@
|
| *******************************************************************************
|
| */
|
|
|
| -#include <typeinfo> // for 'typeid' to work
|
|
|
| #include "unicode/utypes.h"
|
|
|
| @@ -90,7 +89,7 @@
|
| if (this == &that) {
|
| return TRUE;
|
| }
|
| - if (typeid(*this) != typeid(that)
|
| + if (CR_TYPEID(*this) != CR_TYPEID(that)
|
| || BasicTimeZone::operator==(that) == FALSE) {
|
| return FALSE;
|
| }
|
| @@ -115,7 +114,7 @@
|
| if (U_FAILURE(status)) {
|
| return;
|
| }
|
| - AnnualTimeZoneRule* atzrule = dynamic_cast<AnnualTimeZoneRule*>(rule);
|
| + AnnualTimeZoneRule* atzrule = CR_DYNAMIC_CAST<AnnualTimeZoneRule*>(rule);
|
| if (atzrule != NULL && atzrule->getEndYear() == AnnualTimeZoneRule::MAX_YEAR) {
|
| // A final rule
|
| if (fFinalRules == NULL) {
|
| @@ -508,7 +507,7 @@
|
| if (this == &other) {
|
| return TRUE;
|
| }
|
| - if (typeid(*this) != typeid(other)) {
|
| + if (CR_TYPEID(*this) != CR_TYPEID(other)) {
|
| return FALSE;
|
| }
|
| const RuleBasedTimeZone& that = (const RuleBasedTimeZone&)other;
|
|
|