| Index: third_party/icu/source/test/intltest/uobjtest.cpp
|
| ===================================================================
|
| --- third_party/icu/source/test/intltest/uobjtest.cpp (revision 74230)
|
| +++ third_party/icu/source/test/intltest/uobjtest.cpp (working copy)
|
| @@ -7,7 +7,6 @@
|
|
|
| #include <stdio.h>
|
| #include <string.h>
|
| -#include <typeinfo> // for 'typeid' to work
|
|
|
| #include "uobjtest.h"
|
| #include "cmemory.h" // UAlignedMemory
|
| @@ -568,15 +567,15 @@
|
| dataerrln("NumberFormat::createInstance(de) failed - %s", u_errorName(errorCode));
|
| return;
|
| }
|
| - if (dynamic_cast<DecimalFormat *>(nf) == NULL || dynamic_cast<ChoiceFormat *>(nf) != NULL) {
|
| - errln("dynamic_cast<>(NumberFormat) failed");
|
| + if (CR_DYNAMIC_CAST<DecimalFormat *>(nf) == NULL || CR_DYNAMIC_CAST<ChoiceFormat *>(nf) != NULL) {
|
| + errln("CR_DYNAMIC_CAST<>(NumberFormat) failed");
|
| }
|
| UnicodeSet emptySet;
|
| - if (&typeid(*nf) == NULL || typeid(*nf) == typeid(UObject) || typeid(*nf) == typeid(Format) ||
|
| - typeid(*nf) != typeid(DecimalFormat) || typeid(*nf) == typeid(ChoiceFormat) ||
|
| - typeid(*nf) == typeid(emptySet)
|
| + if (&CR_TYPEID(*nf) == NULL || CR_TYPEID(*nf) == CR_TYPEID(UObject) || CR_TYPEID(*nf) == CR_TYPEID(Format) ||
|
| + CR_TYPEID(*nf) != CR_TYPEID(DecimalFormat) || CR_TYPEID(*nf) == CR_TYPEID(ChoiceFormat) ||
|
| + CR_TYPEID(*nf) == CR_TYPEID(emptySet)
|
| ) {
|
| - errln("typeid(NumberFormat) failed");
|
| + errln("CR_TYPEID(NumberFormat) failed");
|
| }
|
| delete nf;
|
| }
|
|
|