| Index: third_party/icu/source/i18n/olsontz.cpp
|
| ===================================================================
|
| --- third_party/icu/source/i18n/olsontz.cpp (revision 74230)
|
| +++ third_party/icu/source/i18n/olsontz.cpp (working copy)
|
| @@ -9,7 +9,6 @@
|
| **********************************************************************
|
| */
|
|
|
| -#include <typeinfo> // for 'typeid' to work
|
|
|
| #include "olsontz.h"
|
|
|
| @@ -301,7 +300,7 @@
|
| */
|
| UBool OlsonTimeZone::operator==(const TimeZone& other) const {
|
| return ((this == &other) ||
|
| - (typeid(*this) == typeid(other) &&
|
| + (CR_TYPEID(*this) == CR_TYPEID(other) &&
|
| TimeZone::operator==(other) &&
|
| hasSameRules(other)));
|
| }
|
| @@ -594,7 +593,7 @@
|
| if (this == &other) {
|
| return TRUE;
|
| }
|
| - const OlsonTimeZone* z = dynamic_cast<const OlsonTimeZone*>(&other);
|
| + const OlsonTimeZone* z = CR_DYNAMIC_CAST<const OlsonTimeZone*>(&other);
|
| if (z == NULL) {
|
| return FALSE;
|
| }
|
|
|