| Index: third_party/icu/source/i18n/tzrule.cpp
|
| ===================================================================
|
| --- third_party/icu/source/i18n/tzrule.cpp (revision 74230)
|
| +++ third_party/icu/source/i18n/tzrule.cpp (working copy)
|
| @@ -5,7 +5,6 @@
|
| *******************************************************************************
|
| */
|
|
|
| -#include <typeinfo> // for 'typeid' to work
|
|
|
| #include "unicode/utypes.h"
|
|
|
| @@ -54,7 +53,7 @@
|
| UBool
|
| TimeZoneRule::operator==(const TimeZoneRule& that) const {
|
| return ((this == &that) ||
|
| - (typeid(*this) == typeid(that) &&
|
| + (CR_TYPEID(*this) == CR_TYPEID(that) &&
|
| fName == that.fName &&
|
| fRawOffset == that.fRawOffset &&
|
| fDSTSavings == that.fDSTSavings));
|
| @@ -84,7 +83,7 @@
|
| UBool
|
| TimeZoneRule::isEquivalentTo(const TimeZoneRule& other) const {
|
| return ((this == &other) ||
|
| - (typeid(*this) == typeid(other) &&
|
| + (CR_TYPEID(*this) == CR_TYPEID(other) &&
|
| fRawOffset == other.fRawOffset &&
|
| fDSTSavings == other.fDSTSavings));
|
| }
|
| @@ -121,7 +120,7 @@
|
| UBool
|
| InitialTimeZoneRule::operator==(const TimeZoneRule& that) const {
|
| return ((this == &that) ||
|
| - (typeid(*this) == typeid(that) &&
|
| + (CR_TYPEID(*this) == CR_TYPEID(that) &&
|
| TimeZoneRule::operator==(that)));
|
| }
|
|
|
| @@ -135,7 +134,7 @@
|
| if (this == &other) {
|
| return TRUE;
|
| }
|
| - if (typeid(*this) != typeid(other) || TimeZoneRule::isEquivalentTo(other) == FALSE) {
|
| + if (CR_TYPEID(*this) != CR_TYPEID(other) || TimeZoneRule::isEquivalentTo(other) == FALSE) {
|
| return FALSE;
|
| }
|
| return TRUE;
|
| @@ -229,7 +228,7 @@
|
| if (this == &that) {
|
| return TRUE;
|
| }
|
| - if (typeid(*this) != typeid(that)) {
|
| + if (CR_TYPEID(*this) != CR_TYPEID(that)) {
|
| return FALSE;
|
| }
|
| AnnualTimeZoneRule *atzr = (AnnualTimeZoneRule*)&that;
|
| @@ -321,7 +320,7 @@
|
| if (this == &other) {
|
| return TRUE;
|
| }
|
| - if (typeid(*this) != typeid(other) || TimeZoneRule::isEquivalentTo(other) == FALSE) {
|
| + if (CR_TYPEID(*this) != CR_TYPEID(other) || TimeZoneRule::isEquivalentTo(other) == FALSE) {
|
| return FALSE;
|
| }
|
| AnnualTimeZoneRule* that = (AnnualTimeZoneRule*)&other;
|
| @@ -448,7 +447,7 @@
|
| if (this == &that) {
|
| return TRUE;
|
| }
|
| - if (typeid(*this) != typeid(that) || TimeZoneRule::operator==(that) == FALSE) {
|
| + if (CR_TYPEID(*this) != CR_TYPEID(that) || TimeZoneRule::operator==(that) == FALSE) {
|
| return FALSE;
|
| }
|
| TimeArrayTimeZoneRule *tatzr = (TimeArrayTimeZoneRule*)&that;
|
| @@ -496,7 +495,7 @@
|
| if (this == &other) {
|
| return TRUE;
|
| }
|
| - if (typeid(*this) != typeid(other) || TimeZoneRule::isEquivalentTo(other) == FALSE) {
|
| + if (CR_TYPEID(*this) != CR_TYPEID(other) || TimeZoneRule::isEquivalentTo(other) == FALSE) {
|
| return FALSE;
|
| }
|
| TimeArrayTimeZoneRule* that = (TimeArrayTimeZoneRule*)&other;
|
|
|