maximumDigits-1 should be
* incremented
*/
-bool_t DigitList::shouldRoundUp(int32_t maximumDigits) {
+UBool DigitList::shouldRoundUp(int32_t maximumDigits) {
// Implement IEEE half-even rounding
if (fDigits[maximumDigits] > '5') {
return TRUE;
@@ -481,7 +481,7 @@ bool_t DigitList::shouldRoundUp(int32_t maximumDigits) {
* Return true if this object represents the value zero. Anything with
* no digits, or all zero digits, is zero, regardless of fDecimalAt.
*/
-bool_t
+UBool
DigitList::isZero() const
{
for (int32_t i=0; iu_strlen().
* @draft
*/
- UnicodeString &setTo(bool_t isTerminated,
+ UnicodeString &setTo(UBool isTerminated,
const UChar *text,
int32_t textLength);
@@ -1498,7 +1498,7 @@ public:
* @return TRUE if the text was padded, FALSE otherwise.
* @draft
*/
- bool_t padLeading(int32_t targetLength,
+ UBool padLeading(int32_t targetLength,
UChar padChar = 0x0020);
/**
@@ -1512,7 +1512,7 @@ public:
* @return TRUE if the text was padded, FALSE otherwise.
* @draft
*/
- bool_t padTrailing(int32_t targetLength,
+ UBool padTrailing(int32_t targetLength,
UChar padChar = 0x0020);
/**
@@ -1521,7 +1521,7 @@ public:
* @return TRUE if the text was truncated, FALSE otherwise
* @stable
*/
- inline bool_t truncate(int32_t targetLength);
+ inline UBool truncate(int32_t targetLength);
/**
* Trims leading and trailing whitespace from this UnicodeString.
@@ -1659,7 +1659,7 @@ public:
* by calling u_strlen().
* @stable
*/
- UnicodeString(bool_t isTerminated,
+ UnicodeString(UBool isTerminated,
const UChar *text,
int32_t textLength);
@@ -1752,7 +1752,7 @@ public:
*/
int32_t numDisplayCells(UTextOffset start = 0,
int32_t length = INT32_MAX,
- bool_t asian = TRUE) const;
+ UBool asian = TRUE) const;
UCharReference operator[] (UTextOffset pos);
@@ -1824,7 +1824,7 @@ private:
// sets refCount to 1 if appropriate
// sets fArray, fCapacity, and fFlags
// returns boolean for success or failure
- bool_t allocate(int32_t capacity);
+ UBool allocate(int32_t capacity);
// release the array if owned
inline void releaseArray();
@@ -1861,9 +1861,9 @@ private:
*
* Return FALSE if memory could not be allocated.
*/
- bool_t cloneArrayIfNeeded(int32_t newCapacity = -1,
+ UBool cloneArrayIfNeeded(int32_t newCapacity = -1,
int32_t growCapacity = -1,
- bool_t doCopyArray = TRUE,
+ UBool doCopyArray = TRUE,
int32_t **pBufferToDelete = 0);
// ref counting
@@ -1990,7 +1990,7 @@ uprv_arrayCopy(const UnicodeString *src, int32_t srcStart,
//========================================
// Read-only alias methods
//========================================
-inline bool_t
+inline UBool
UnicodeString::operator== (const UnicodeString& text) const
{
if(isBogus()) {
@@ -2003,23 +2003,23 @@ UnicodeString::operator== (const UnicodeString& text) const
}
}
-inline bool_t
+inline UBool
UnicodeString::operator!= (const UnicodeString& text) const
{ return (! operator==(text)); }
-inline bool_t
+inline UBool
UnicodeString::operator> (const UnicodeString& text) const
{ return doCompare(0, fLength, text, 0, text.fLength) == 1; }
-inline bool_t
+inline UBool
UnicodeString::operator< (const UnicodeString& text) const
{ return doCompare(0, fLength, text, 0, text.fLength) == -1; }
-inline bool_t
+inline UBool
UnicodeString::operator>= (const UnicodeString& text) const
{ return doCompare(0, fLength, text, 0, text.fLength) != -1; }
-inline bool_t
+inline UBool
UnicodeString::operator<= (const UnicodeString& text) const
{ return doCompare(0, fLength, text, 0, text.fLength) != 1; }
@@ -2282,46 +2282,46 @@ UnicodeString::lastIndexOf(UChar32 c,
}
}
-inline bool_t
+inline UBool
UnicodeString::startsWith(const UnicodeString& text) const
{ return compare(0, text.fLength, text, 0, text.fLength) == 0; }
-inline bool_t
+inline UBool
UnicodeString::startsWith(const UnicodeString& srcText,
UTextOffset srcStart,
int32_t srcLength) const
{ return doCompare(0, srcLength, srcText, srcStart, srcLength) == 0; }
-inline bool_t
+inline UBool
UnicodeString::startsWith(const UChar *srcChars,
int32_t srcLength) const
{ return doCompare(0, srcLength, srcChars, 0, srcLength) == 0; }
-inline bool_t
+inline UBool
UnicodeString::startsWith(const UChar *srcChars,
UTextOffset srcStart,
int32_t srcLength) const
{ return doCompare(0, srcLength, srcChars, srcStart, srcLength) == 0;}
-inline bool_t
+inline UBool
UnicodeString::endsWith(const UnicodeString& text) const
{ return doCompare(fLength - text.fLength, text.fLength,
text, 0, text.fLength) == 0; }
-inline bool_t
+inline UBool
UnicodeString::endsWith(const UnicodeString& srcText,
UTextOffset srcStart,
int32_t srcLength) const
{ return doCompare(fLength - srcLength, srcLength,
srcText, srcStart, srcLength) == 0; }
-inline bool_t
+inline UBool
UnicodeString::endsWith(const UChar *srcChars,
int32_t srcLength) const
{ return doCompare(fLength - srcLength, srcLength,
srcChars, 0, srcLength) == 0; }
-inline bool_t
+inline UBool
UnicodeString::endsWith(const UChar *srcChars,
UTextOffset srcStart,
int32_t srcLength) const
@@ -2478,7 +2478,7 @@ UnicodeString::getCharLimit(UTextOffset offset) {
}
}
-inline bool_t
+inline UBool
UnicodeString::empty() const
{ return fLength == 0; }
@@ -2613,7 +2613,7 @@ UnicodeString::removeBetween(UTextOffset start,
UTextOffset limit)
{ return doReplace(start, limit - start, 0, 0, 0); }
-inline bool_t
+inline UBool
UnicodeString::truncate(int32_t targetLength)
{
if((uint32_t)targetLength < (uint32_t)fLength) {
@@ -2637,7 +2637,7 @@ UnicodeString::reverse(UTextOffset start,
//========================================
// Write implementation methods
//========================================
-inline bool_t
+inline UBool
UnicodeString::isBogus() const
{ return fFlags & kIsBogus; }
diff --git a/icu4c/source/common/unicode/ures.h b/icu4c/source/common/unicode/ures.h
index 98e51d69aab..32ed512d4ec 100644
--- a/icu4c/source/common/unicode/ures.h
+++ b/icu4c/source/common/unicode/ures.h
@@ -449,7 +449,7 @@ U_CAPI void U_EXPORT2 ures_resetIterator(UResourceBundle *resourceBundle);
* @return TRUE if there are more elements, FALSE if there is no more elements
* @draft
*/
-U_CAPI bool_t U_EXPORT2 ures_hasNext(UResourceBundle *resourceBundle);
+U_CAPI UBool U_EXPORT2 ures_hasNext(UResourceBundle *resourceBundle);
/**
* Returns the next resource in a given resource or NULL if there are no more resources
diff --git a/icu4c/source/common/unicode/ustring.h b/icu4c/source/common/unicode/ustring.h
index 48b806861b9..dfddf97512f 100644
--- a/icu4c/source/common/unicode/ustring.h
+++ b/icu4c/source/common/unicode/ustring.h
@@ -188,7 +188,7 @@ U_CAPI char* U_EXPORT2 u_austrcpy(char *s1,
*
* U_STRING_DECL(ustringVar1, "Quick-Fox 2", 11);
* U_STRING_DECL(ustringVar2, "jumps 5%", 8);
- * static bool_t didInit=FALSE;
+ * static UBool didInit=FALSE;
*
* int32_t function() {
* if(!didInit) {
diff --git a/icu4c/source/common/unicode/utf8.h b/icu4c/source/common/unicode/utf8.h
index 58672a19bb4..bfbd2e6cd85 100644
--- a/icu4c/source/common/unicode/utf8.h
+++ b/icu4c/source/common/unicode/utf8.h
@@ -39,13 +39,13 @@ utf8_countTrailBytes[256];
#define UTF8_MASK_LEAD_BYTE(leadByte, countTrailBytes) ((leadByte)&=(1<<(6-(countTrailBytes)))-1)
U_CAPI UChar32 U_EXPORT2
-utf8_nextCharSafeBody(const uint8_t *s, UTextOffset *pi, UTextOffset length, UChar32 c, bool_t strict);
+utf8_nextCharSafeBody(const uint8_t *s, UTextOffset *pi, UTextOffset length, UChar32 c, UBool strict);
U_CAPI UTextOffset U_EXPORT2
utf8_appendCharSafeBody(uint8_t *s, UTextOffset i, UTextOffset length, UChar32 c);
U_CAPI UChar32 U_EXPORT2
-utf8_prevCharSafeBody(const uint8_t *s, UTextOffset start, UTextOffset *pi, UChar32 c, bool_t strict);
+utf8_prevCharSafeBody(const uint8_t *s, UTextOffset start, UTextOffset *pi, UChar32 c, UBool strict);
U_CAPI UTextOffset U_EXPORT2
utf8_back1SafeBody(const uint8_t *s, UTextOffset start, UTextOffset i);
diff --git a/icu4c/source/common/unicode/utypes.h b/icu4c/source/common/unicode/utypes.h
index 7e7aa33d1e7..2b10ab2f325 100644
--- a/icu4c/source/common/unicode/utypes.h
+++ b/icu4c/source/common/unicode/utypes.h
@@ -244,9 +244,9 @@ typedef enum UErrorCode UErrorCode;
/* operational success or failure. */
#ifdef XP_CPLUSPLUS
/** @stable */
-inline bool_t U_SUCCESS(UErrorCode code) { return (bool_t)(code<=U_ZERO_ERROR); }
+inline UBool U_SUCCESS(UErrorCode code) { return (UBool)(code<=U_ZERO_ERROR); }
/** @stable */
-inline bool_t U_FAILURE(UErrorCode code) { return (bool_t)(code>U_ZERO_ERROR); }
+inline UBool U_FAILURE(UErrorCode code) { return (UBool)(code>U_ZERO_ERROR); }
#else
/** @stable */
#define U_SUCCESS(x) ((x)<=U_ZERO_ERROR)
diff --git a/icu4c/source/common/unistr.cpp b/icu4c/source/common/unistr.cpp
index 84c4478ff8e..2f44d3af7ba 100644
--- a/icu4c/source/common/unistr.cpp
+++ b/icu4c/source/common/unistr.cpp
@@ -199,7 +199,7 @@ UnicodeString::UnicodeString(const UChar *text,
doReplace(0, 0, text, 0, textLength);
}
-UnicodeString::UnicodeString(bool_t isTerminated,
+UnicodeString::UnicodeString(UBool isTerminated,
const UChar *text,
int32_t textLength)
: fArray((UChar *)text),
@@ -269,7 +269,7 @@ UnicodeString::UnicodeString(const UnicodeString& that)
// array allocation
//========================================
-bool_t
+UBool
UnicodeString::allocate(int32_t capacity) {
if(capacity <= US_STACKBUF_SIZE) {
fArray = fStackBuffer;
@@ -379,7 +379,7 @@ UnicodeString::operator= (const UnicodeString& src)
int32_t
UnicodeString::numDisplayCells( UTextOffset start,
int32_t length,
- bool_t asian) const
+ UBool asian) const
{
// pin indices to legal values
pinIndices(start, length);
@@ -703,7 +703,7 @@ UnicodeString::setToBogus()
// setTo() analogous to the readonly-aliasing constructor with the same signature
UnicodeString &
-UnicodeString::setTo(bool_t isTerminated,
+UnicodeString::setTo(UBool isTerminated,
const UChar *text,
int32_t textLength)
{
@@ -1055,7 +1055,7 @@ UnicodeString::doReverse(UTextOffset start,
return *this;
}
-bool_t
+UBool
UnicodeString::padLeading(int32_t targetLength,
UChar padChar)
{
@@ -1075,7 +1075,7 @@ UnicodeString::padLeading(int32_t targetLength,
}
}
-bool_t
+UBool
UnicodeString::padTrailing(int32_t targetLength,
UChar padChar)
{
@@ -1289,7 +1289,7 @@ UnicodeString::doCodepageCreate(const char *codepageData,
int32_t arraySize = dataLength + (dataLength >> 2);
// we do not care about the current contents
- bool_t doCopyArray = FALSE;
+ UBool doCopyArray = FALSE;
for(;;) {
if(!cloneArrayIfNeeded(arraySize, arraySize, doCopyArray)) {
setToBogus();
@@ -1353,10 +1353,10 @@ UnicodeString::getUChars() const {
//========================================
// Miscellaneous
//========================================
-bool_t
+UBool
UnicodeString::cloneArrayIfNeeded(int32_t newCapacity,
int32_t growCapacity,
- bool_t doCopyArray,
+ UBool doCopyArray,
int32_t **pBufferToDelete) {
// default parameters need to be static, therefore
// the defaults are -1 to have convenience defaults
diff --git a/icu4c/source/common/uresbund.c b/icu4c/source/common/uresbund.c
index 6cd1effaa8e..4557f0db6ee 100644
--- a/icu4c/source/common/uresbund.c
+++ b/icu4c/source/common/uresbund.c
@@ -27,7 +27,7 @@ void entryClose(UResourceDataEntry *resB);
/* Static cache for already opened resource bundles - mostly for keeping fallback info */
static UHashtable *cache = NULL;
-static bool_t isMutexInited = FALSE;
+static UBool isMutexInited = FALSE;
static UMTX resbMutex = NULL;
/* INTERNAL: hashes an entry */
@@ -37,7 +37,7 @@ int32_t hashEntry(const void *parm) {
}
/* INTERNAL: compares two entries */
-bool_t compareEntries(const void *p1, const void *p2) {
+UBool compareEntries(const void *p1, const void *p2) {
UResourceDataEntry *b1 = (UResourceDataEntry *)p1;
UResourceDataEntry *b2 = (UResourceDataEntry *)p2;
@@ -50,7 +50,7 @@ bool_t compareEntries(const void *p1, const void *p2) {
* Internal function, gets parts of locale name according
* to the position of '_' character
*/
-bool_t chopLocale(char *name) {
+UBool chopLocale(char *name) {
char *i = uprv_strrchr(name, '_');
if(i != NULL) {
@@ -187,7 +187,7 @@ UResourceDataEntry *init_entry(const char *localeID, const char *path, UErrorCod
r->fCountExisting++; /* we just increase it's reference count */
*status = r->fBogus; /* and set returning status */
} else { /* otherwise, we'll try to construct a new entry */
- bool_t result = FALSE;
+ UBool result = FALSE;
r = (UResourceDataEntry *) uprv_malloc(sizeof(UResourceDataEntry));
@@ -265,10 +265,10 @@ UResourceDataEntry *entryOpen(const char* path, const char* localeID, UErrorCode
UResourceDataEntry *r = NULL;
UResourceDataEntry *t1 = NULL;
UResourceDataEntry *t2 = NULL;
- bool_t isDefault = FALSE;
- bool_t isRoot = FALSE;
- bool_t hasRealData = FALSE;
- bool_t hasChopped = FALSE;
+ UBool isDefault = FALSE;
+ UBool isRoot = FALSE;
+ UBool hasRealData = FALSE;
+ UBool hasChopped = FALSE;
char name[96];
if(U_FAILURE(*status)) {
@@ -420,7 +420,7 @@ UResourceBundle *init_resb_result(const ResourceData *rdata, const Resource r, c
}
UResourceBundle *copyResb(UResourceBundle *r, const UResourceBundle *original) {
- bool_t isStackObject;
+ UBool isStackObject;
if(r == original) {
return r;
}
@@ -471,7 +471,7 @@ void copyResbFillIn(UResourceBundle *r, const UResourceBundle *original) {
U_CFUNC UChar** ures_listInstalledLocales(const char* path, int32_t* count) {
UChar **result;
UErrorCode status;
- bool_t opres = FALSE;
+ UBool opres = FALSE;
ResourceData *res = (ResourceData *)uprv_malloc(sizeof(ResourceData));
opres = res_load(res, path, kIndexLocaleName, &status);
@@ -587,7 +587,7 @@ U_CAPI void U_EXPORT2 ures_resetIterator(UResourceBundle *resB){
resB->fIndex = -1;
}
-U_CAPI bool_t U_EXPORT2 ures_hasNext(UResourceBundle *resB) {
+U_CAPI UBool U_EXPORT2 ures_hasNext(UResourceBundle *resB) {
if(resB == NULL) {
return FALSE;
}
diff --git a/icu4c/source/common/uresdata.c b/icu4c/source/common/uresdata.c
index 8ac2f05afd6..48af23145a2 100644
--- a/icu4c/source/common/uresdata.c
+++ b/icu4c/source/common/uresdata.c
@@ -164,7 +164,7 @@ _res_findTableIndex(const Resource *pRoot, const Resource res, const char *key)
}
}
-static bool_t
+static UBool
_res_isStringArray(Resource *r) {
int32_t count=*(int32_t *)r;
@@ -180,7 +180,7 @@ _res_isStringArray(Resource *r) {
/* helper for res_load() ---------------------------------------------------- */
-static bool_t
+static UBool
isAcceptable(void *context,
const char *type, const char *name,
const UDataInfo *pInfo) {
@@ -198,7 +198,7 @@ isAcceptable(void *context,
/* semi-public functions ---------------------------------------------------- */
-U_CFUNC bool_t
+U_CFUNC UBool
res_load(ResourceData *pResData,
const char *path, const char *name, UErrorCode *errorCode) {
if(errorCode==NULL || U_FAILURE(*errorCode)) {
diff --git a/icu4c/source/common/uresdata.h b/icu4c/source/common/uresdata.h
index 8e9a56a9acb..c8e064120a4 100644
--- a/icu4c/source/common/uresdata.h
+++ b/icu4c/source/common/uresdata.h
@@ -73,7 +73,7 @@ typedef struct {
* Load a resource bundle file.
* The ResourceData structure must be allocated externally.
*/
-U_CFUNC bool_t
+U_CFUNC UBool
res_load(ResourceData *pResData,
const char *path, const char *name, UErrorCode *errorCode);
diff --git a/icu4c/source/common/uresimp.h b/icu4c/source/common/uresimp.h
index 2394e13a068..82979ae163a 100644
--- a/icu4c/source/common/uresimp.h
+++ b/icu4c/source/common/uresimp.h
@@ -51,9 +51,9 @@ struct UResourceDataEntry {
struct UResourceBundle {
const char *fKey; /*tag*/
char *fVersion;
- bool_t fHasFallback;
- bool_t fIsTopLevel;
- bool_t fIsStackObject;
+ UBool fHasFallback;
+ UBool fIsTopLevel;
+ UBool fIsStackObject;
UResourceDataEntry *fData; /*for low-level access*/
int32_t fIndex;
int32_t fSize;
@@ -67,7 +67,7 @@ U_CFUNC const char* ures_getRealLocale(const UResourceBundle* resourceBundle, UE
/*U_CFUNC UChar** ures_listInstalledLocales(const char *path, int32_t* count);*/
U_CFUNC const ResourceData *getFallbackData(const UResourceBundle* resBundle, const char* * resTag, Resource *res, UErrorCode *status);
U_CFUNC int32_t hashBundle(const void *parm);
-U_CFUNC bool_t compareBundles(const void *p1, const void *p2);
+U_CFUNC UBool compareBundles(const void *p1, const void *p2);
/* Candidates for export */
U_CFUNC UResourceBundle *copyResb(UResourceBundle *r, const UResourceBundle *original);
diff --git a/icu4c/source/common/utf_impl.c b/icu4c/source/common/utf_impl.c
index 798635296d9..15d0a627f7a 100644
--- a/icu4c/source/common/utf_impl.c
+++ b/icu4c/source/common/utf_impl.c
@@ -74,7 +74,7 @@ utf8_errorValue[6]={
};
U_CAPI UChar32 U_EXPORT2
-utf8_nextCharSafeBody(const uint8_t *s, UTextOffset *pi, UTextOffset length, UChar32 c, bool_t strict) {
+utf8_nextCharSafeBody(const uint8_t *s, UTextOffset *pi, UTextOffset length, UChar32 c, UBool strict) {
UTextOffset i=*pi;
uint8_t count=UTF8_COUNT_TRAIL_BYTES(c);
if((i)+count<=(length)) {
@@ -193,7 +193,7 @@ utf8_appendCharSafeBody(uint8_t *s, UTextOffset i, UTextOffset length, UChar32 c
}
U_CAPI UChar32 U_EXPORT2
-utf8_prevCharSafeBody(const uint8_t *s, UTextOffset start, UTextOffset *pi, UChar32 c, bool_t strict) {
+utf8_prevCharSafeBody(const uint8_t *s, UTextOffset start, UTextOffset *pi, UChar32 c, UBool strict) {
UTextOffset i=*pi;
uint8_t b, count=1, shift=6;
diff --git a/icu4c/source/common/uvector.cpp b/icu4c/source/common/uvector.cpp
index dc640d22e7d..57e120d190d 100644
--- a/icu4c/source/common/uvector.cpp
+++ b/icu4c/source/common/uvector.cpp
@@ -11,7 +11,7 @@
#include "uvector.h"
#include "cmemory.h"
-bool_t UVector::outOfMemory = FALSE;
+UBool UVector::outOfMemory = FALSE;
UVector::UVector(int32_t initialCapacity) :
capacity(0),
@@ -86,7 +86,7 @@ void UVector::removeElementAt(int32_t index) {
}
}
-bool_t UVector::removeElement(void* obj) {
+UBool UVector::removeElement(void* obj) {
int32_t i = indexOf(obj);
if (i >= 0) {
removeElementAt(i);
@@ -117,7 +117,7 @@ int32_t UVector::indexOf(void* obj, int32_t startIndex) const {
return -1;
}
-bool_t UVector::ensureCapacity(int32_t minimumCapacity) {
+UBool UVector::ensureCapacity(int32_t minimumCapacity) {
if (capacity >= minimumCapacity) {
return TRUE;
} else {
@@ -147,7 +147,7 @@ UVector::Comparer UVector::setComparer(Comparer d) {
return old;
}
-bool_t UVector::isOutOfMemory(void) {
+UBool UVector::isOutOfMemory(void) {
return outOfMemory;
}
diff --git a/icu4c/source/common/uvector.h b/icu4c/source/common/uvector.h
index d14e0cc82b5..2b4edb5bcfc 100644
--- a/icu4c/source/common/uvector.h
+++ b/icu4c/source/common/uvector.h
@@ -67,7 +67,7 @@
class U_COMMON_API UVector {
public:
typedef void (*Deleter)(void*);
- typedef bool_t (*Comparer)(void*, void*);
+ typedef UBool (*Comparer)(void*, void*);
private:
int32_t count;
@@ -80,7 +80,7 @@ private:
Comparer comparer;
- static bool_t outOfMemory;
+ static UBool outOfMemory;
public:
UVector(int32_t initialCapacity = 8);
@@ -107,19 +107,19 @@ public:
int32_t indexOf(void* obj, int32_t startIndex = 0) const;
- bool_t contains(void* obj) const;
+ UBool contains(void* obj) const;
void removeElementAt(int32_t index);
- bool_t removeElement(void* obj);
+ UBool removeElement(void* obj);
void removeAllElements();
int32_t size(void) const;
- bool_t isEmpty(void) const;
+ UBool isEmpty(void) const;
- bool_t ensureCapacity(int32_t minimumCapacity);
+ UBool ensureCapacity(int32_t minimumCapacity);
//------------------------------------------------------------
// New API
@@ -129,7 +129,7 @@ public:
Comparer setComparer(Comparer c);
- static bool_t isOutOfMemory(void);
+ static UBool isOutOfMemory(void);
void* operator[](int32_t index) const;
@@ -180,7 +180,7 @@ public:
// It's okay not to have a virtual destructor (in UVector)
// because UStack has no special cleanup to do.
- bool_t empty(void) const;
+ UBool empty(void) const;
void* peek(void) const;
@@ -205,11 +205,11 @@ inline int32_t UVector::size(void) const {
return count;
}
-inline bool_t UVector::isEmpty(void) const {
+inline UBool UVector::isEmpty(void) const {
return count == 0;
}
-inline bool_t UVector::contains(void* obj) const {
+inline UBool UVector::contains(void* obj) const {
return indexOf(obj) >= 0;
}
@@ -227,7 +227,7 @@ inline void* UVector::operator[](int32_t index) const {
// UStack inlines
-inline bool_t UStack::empty(void) const {
+inline UBool UStack::empty(void) const {
return isEmpty();
}
diff --git a/icu4c/source/extra/ustdio/ufile.c b/icu4c/source/extra/ustdio/ufile.c
index 1a7e420559f..2105832717a 100644
--- a/icu4c/source/extra/ustdio/ufile.c
+++ b/icu4c/source/extra/ustdio/ufile.c
@@ -120,7 +120,7 @@ ufile_lookup_codepage(const char *locale)
return 0;
}
-bool_t hasICUData() {
+UBool hasICUData() {
UErrorCode status = U_ZERO_ERROR;
UConverter *cnv = NULL;
UResourceBundle *r = NULL;
@@ -151,7 +151,7 @@ u_fopen(const char *filename,
const char *codepage)
{
UErrorCode status = U_ZERO_ERROR;
- bool_t useSysCP = (locale == 0 && codepage == 0);
+ UBool useSysCP = (locale == 0 && codepage == 0);
UFILE *result = (UFILE*) malloc(sizeof(UFILE));
if(result == 0)
return 0;
@@ -206,7 +206,7 @@ u_finit(FILE *f,
const char *codepage)
{
UErrorCode status = U_ZERO_ERROR;
- bool_t useSysCP = (locale == NULL && codepage == NULL);
+ UBool useSysCP = (locale == NULL && codepage == NULL);
UFILE *result = (UFILE*) malloc(sizeof(UFILE));
if(result == 0)
return 0;
diff --git a/icu4c/source/extra/ustdio/ufile.h b/icu4c/source/extra/ustdio/ufile.h
index 9c17b54c5c5..2c9e9eb7fed 100644
--- a/icu4c/source/extra/ustdio/ufile.h
+++ b/icu4c/source/extra/ustdio/ufile.h
@@ -32,10 +32,10 @@
/* A UFILE */
struct UFILE {
FILE *fFile; /* the actual fs interface */
- bool_t fOwnFile; /* TRUE if fFile should be closed */
+ UBool fOwnFile; /* TRUE if fFile should be closed */
ULocaleBundle *fBundle; /* formatters */
- bool_t fOwnBundle; /* TRUE if fBundle should be deleted */
+ UBool fOwnBundle; /* TRUE if fBundle should be deleted */
UConverter *fConverter; /* for codeset conversion */
diff --git a/icu4c/source/extra/ustdio/ufmt_cmn.c b/icu4c/source/extra/ustdio/ufmt_cmn.c
index 832f7ff5c0d..e513974a127 100644
--- a/icu4c/source/extra/ustdio/ufmt_cmn.c
+++ b/icu4c/source/extra/ustdio/ufmt_cmn.c
@@ -28,7 +28,7 @@ ufmt_digitvalue(UChar c)
return c - 0x0030 - (c >= 0x0041 ? (c >= 0x0061 ? 39 : 7) : 0);
}
-bool_t
+UBool
ufmt_isdigit(UChar c,
int32_t radix)
{
@@ -45,7 +45,7 @@ ufmt_ltou(UChar *buffer,
int32_t *len,
long value,
int32_t radix,
- bool_t uselower,
+ UBool uselower,
int32_t minDigits)
{
int32_t length = 0;
@@ -114,7 +114,7 @@ ufmt_utol(const UChar *buffer,
return result;
}
-bool_t
+UBool
ufmt_isws(UChar c)
{
return (c == 0x0020 || /* space */
diff --git a/icu4c/source/extra/ustdio/ufmt_cmn.h b/icu4c/source/extra/ustdio/ufmt_cmn.h
index 610f1c44b6f..e00fb428120 100644
--- a/icu4c/source/extra/ustdio/ufmt_cmn.h
+++ b/icu4c/source/extra/ustdio/ufmt_cmn.h
@@ -77,7 +77,7 @@ ufmt_digitvalue(UChar c);
* @param radix The desired radix.
* @return TRUE if c is a digit in radix, FALSE otherwise.
*/
-bool_t
+UBool
ufmt_isdigit(UChar c,
int32_t radix);
@@ -97,7 +97,7 @@ ufmt_ltou(UChar *buffer,
int32_t *len,
long value,
int32_t radix,
- bool_t uselower,
+ UBool uselower,
int32_t minDigits);
/**
@@ -121,7 +121,7 @@ ufmt_utol(const UChar *buffer,
* form-feed (U+000C), or any other Unicode-defined space, line, or paragraph
* separator.
*/
-bool_t
+UBool
ufmt_isws(UChar c);
/**
diff --git a/icu4c/source/extra/ustdio/uprintf.c b/icu4c/source/extra/ustdio/uprintf.c
index 7985e811441..7a2abf526f0 100644
--- a/icu4c/source/extra/ustdio/uprintf.c
+++ b/icu4c/source/extra/ustdio/uprintf.c
@@ -36,7 +36,7 @@
u_printf_handler g_u_printf_handlers [256];
u_printf_info g_u_printf_infos [256];
-bool_t g_u_printf_inited = FALSE;
+UBool g_u_printf_inited = FALSE;
/* buffer size for formatting */
#define UFPRINTF_BUFFER_SIZE 1024
@@ -337,7 +337,7 @@ u_printf_hex_handler(UFILE *stream,
/* format the number, preserving the minimum # of digits */
ufmt_ltou(result, &len, num, 16,
- (bool_t)(info->fSpec == 0x0078),
+ (UBool)(info->fSpec == 0x0078),
(info->fPrecision == -1 && info->fZero) ? info->fWidth : info->fPrecision);
/* convert to alt form, if desired */
@@ -1264,7 +1264,7 @@ u_printf_scidbl_handler(UFILE *stream,
const ufmt_args *args)
{
double num = (double)(args[0].doubleValue);
- bool_t useE;
+ UBool useE;
/* a precision of 0 is taken as 1 */
if(info->fPrecision == 0)
diff --git a/icu4c/source/extra/ustdio/uprintf.h b/icu4c/source/extra/ustdio/uprintf.h
index 09e889673f4..d3bf7689947 100644
--- a/icu4c/source/extra/ustdio/uprintf.h
+++ b/icu4c/source/extra/ustdio/uprintf.h
@@ -34,16 +34,16 @@ struct u_printf_spec_info {
UChar fPadChar; /* Padding character */
- bool_t fAlt; /* # flag */
- bool_t fSpace; /* Space flag */
- bool_t fLeft; /* - flag */
- bool_t fShowSign; /* + flag */
- bool_t fZero; /* 0 flag */
+ UBool fAlt; /* # flag */
+ UBool fSpace; /* Space flag */
+ UBool fLeft; /* - flag */
+ UBool fShowSign; /* + flag */
+ UBool fZero; /* 0 flag */
- bool_t fIsLongDouble; /* L flag */
- bool_t fIsShort; /* h flag */
- bool_t fIsLong; /* l flag */
- bool_t fIsLongLong; /* ll flag */
+ UBool fIsLongDouble; /* L flag */
+ UBool fIsShort; /* h flag */
+ UBool fIsLong; /* l flag */
+ UBool fIsLongLong; /* ll flag */
};
typedef struct u_printf_spec_info u_printf_spec_info;
diff --git a/icu4c/source/extra/ustdio/uscanf.c b/icu4c/source/extra/ustdio/uscanf.c
index 0d6a2d65a94..2b26eee063e 100644
--- a/icu4c/source/extra/ustdio/uscanf.c
+++ b/icu4c/source/extra/ustdio/uscanf.c
@@ -37,7 +37,7 @@
u_scanf_handler g_u_scanf_handlers [256];
u_scanf_info g_u_scanf_infos [256];
-bool_t g_u_scanf_inited = FALSE;
+UBool g_u_scanf_inited = FALSE;
int32_t
u_fscanf( UFILE *f,
@@ -531,7 +531,7 @@ u_scanf_scidbl_handler(UFILE *stream,
int32_t scientificParsePos = 0, genericParsePos = 0;
UErrorCode scientificStatus = U_ZERO_ERROR;
UErrorCode genericStatus = U_ZERO_ERROR;
- bool_t useScientific;
+ UBool useScientific;
/* since we can't determine by scanning the characters whether */
@@ -1161,7 +1161,7 @@ u_scanf_scanset_handler(UFILE *stream,
{
u_scanf_scanset scanset;
int32_t len;
- bool_t success;
+ UBool success;
UChar c;
const UChar *source;
UConverter *conv;
diff --git a/icu4c/source/extra/ustdio/uscanf.h b/icu4c/source/extra/ustdio/uscanf.h
index 29798ef22c5..5622597597e 100644
--- a/icu4c/source/extra/ustdio/uscanf.h
+++ b/icu4c/source/extra/ustdio/uscanf.h
@@ -32,10 +32,10 @@ struct u_scanf_spec_info {
UChar fPadChar; /* Padding character */
- bool_t fIsLongDouble; /* L flag */
- bool_t fIsShort; /* h flag */
- bool_t fIsLong; /* l flag */
- bool_t fIsLongLong; /* ll flag */
+ UBool fIsLongDouble; /* L flag */
+ UBool fIsShort; /* h flag */
+ UBool fIsLong; /* l flag */
+ UBool fIsLongLong; /* ll flag */
};
typedef struct u_scanf_spec_info u_scanf_spec_info;
diff --git a/icu4c/source/extra/ustdio/uscanf_p.h b/icu4c/source/extra/ustdio/uscanf_p.h
index 8daaab7b5bc..6987e236b7b 100644
--- a/icu4c/source/extra/ustdio/uscanf_p.h
+++ b/icu4c/source/extra/ustdio/uscanf_p.h
@@ -27,7 +27,7 @@
struct u_scanf_spec {
u_scanf_spec_info fInfo; /* Information on this spec */
int32_t fArgPos; /* Position of data in arg list */
- bool_t fSkipArg; /* TRUE if arg should be skipped */
+ UBool fSkipArg; /* TRUE if arg should be skipped */
};
typedef struct u_scanf_spec u_scanf_spec;
diff --git a/icu4c/source/extra/ustdio/uscanset.c b/icu4c/source/extra/ustdio/uscanset.c
index c48e0e56875..54da8eef783 100644
--- a/icu4c/source/extra/ustdio/uscanset.c
+++ b/icu4c/source/extra/ustdio/uscanset.c
@@ -19,7 +19,7 @@
#include "uscanset.h"
-bool_t
+UBool
u_scanf_scanset_add(u_scanf_scanset *scanset,
UChar c)
{
@@ -32,7 +32,7 @@ u_scanf_scanset_add(u_scanf_scanset *scanset,
return TRUE;
}
-bool_t
+UBool
u_scanf_scanset_addrange(u_scanf_scanset *scanset,
UChar start,
UChar end)
@@ -48,7 +48,7 @@ u_scanf_scanset_addrange(u_scanf_scanset *scanset,
return TRUE;
}
-bool_t
+UBool
u_scanf_scanset_init(u_scanf_scanset *scanset,
const UChar *s,
int32_t *len)
@@ -56,7 +56,7 @@ u_scanf_scanset_init(u_scanf_scanset *scanset,
UChar c;
const UChar *limit;
int32_t count;
- bool_t result;
+ UBool result;
/* set up parameters */
@@ -126,7 +126,7 @@ u_scanf_scanset_init(u_scanf_scanset *scanset,
return result;
}
-bool_t
+UBool
u_scanf_scanset_in(u_scanf_scanset *scanset,
UChar c)
{
diff --git a/icu4c/source/extra/ustdio/uscanset.h b/icu4c/source/extra/ustdio/uscanset.h
index 4b062f43ee2..bc7ad2074f9 100644
--- a/icu4c/source/extra/ustdio/uscanset.h
+++ b/icu4c/source/extra/ustdio/uscanset.h
@@ -37,7 +37,7 @@ typedef struct u_scanf_scanset_pair u_scanf_scanset_pair;
* Struct representing a scanset
*/
struct u_scanf_scanset {
- bool_t is_inclusive; /* false if '^' is given */
+ UBool is_inclusive; /* false if '^' is given */
UChar singles [U_SCANF_MAX_SCANSET_SIZE];
u_scanf_scanset_pair pairs [U_SCANF_MAX_SCANSET_SIZE];
@@ -55,7 +55,7 @@ typedef struct u_scanf_scanset u_scanf_scanset;
* a pointer to the number of characters parsed, excluding the final ']'
* @return TRUE if successful, FALSE otherwise.
*/
-bool_t
+UBool
u_scanf_scanset_init(u_scanf_scanset *scanset,
const UChar *s,
int32_t *len);
@@ -66,7 +66,7 @@ u_scanf_scanset_init(u_scanf_scanset *scanset,
* @param c The UChar to test.
* @return TRUE if the UChar is in the scanset, FALSE otherwise
*/
-bool_t
+UBool
u_scanf_scanset_in(u_scanf_scanset *scanset,
UChar c);
diff --git a/icu4c/source/extra/ustdio/ustdio.c b/icu4c/source/extra/ustdio/ustdio.c
index 195b7c1e339..ac5f45c3d6c 100644
--- a/icu4c/source/extra/ustdio/ustdio.c
+++ b/icu4c/source/extra/ustdio/ustdio.c
@@ -30,7 +30,7 @@ static const UChar DELIMITERS [] = { 0x000A, 0x0000 };
#define DELIM_CR 0x000D
#define DELIM_LF 0x000A
-#define IS_STRING_DELIMITER(s) (bool_t)( (s) == DELIM_CR || \
+#define IS_STRING_DELIMITER(s) (UBool)( (s) == DELIM_CR || \
(s) == DELIM_LF )
diff --git a/icu4c/source/i18n/brkdict.cpp b/icu4c/source/i18n/brkdict.cpp
index 61b8f3f7434..dfa90c91173 100644
--- a/icu4c/source/i18n/brkdict.cpp
+++ b/icu4c/source/i18n/brkdict.cpp
@@ -179,7 +179,7 @@ BreakDictionary::at(int32_t row, int32_t col) const
* Given (logical) row and column numbers, returns true if the
* cell in that position is populated
*/
-bool_t
+UBool
BreakDictionary::cellIsPopulated(int32_t row, int32_t col) const
{
// look up the entry in the bitmap index for the specified row.
diff --git a/icu4c/source/i18n/brkdict.h b/icu4c/source/i18n/brkdict.h
index cce3f766446..8a8b0d4606f 100644
--- a/icu4c/source/i18n/brkdict.h
+++ b/icu4c/source/i18n/brkdict.h
@@ -144,7 +144,7 @@ private:
* Given (logical) row and column numbers, returns true if the
* cell in that position is populated
*/
- bool_t cellIsPopulated(int32_t row, int32_t col) const;
+ UBool cellIsPopulated(int32_t row, int32_t col) const;
/**
* Implementation of at() when we know the specified cell is populated.
diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp
index 7e17423d1c5..ab05273635a 100644
--- a/icu4c/source/i18n/calendar.cpp
+++ b/icu4c/source/i18n/calendar.cpp
@@ -245,7 +245,7 @@ Calendar::createInstance(const TimeZone& zone, const Locale& aLocale, UErrorCode
// -------------------------------------
-bool_t
+UBool
Calendar::operator==(const Calendar& that) const
{
UErrorCode status = U_ZERO_ERROR;
@@ -284,7 +284,7 @@ Calendar::operator==(const Calendar& that) const
// -------------------------------------
-bool_t
+UBool
Calendar::equals(const Calendar& when, UErrorCode& status) const
{
return (this == &when ||
@@ -293,7 +293,7 @@ Calendar::equals(const Calendar& when, UErrorCode& status) const
// -------------------------------------
-bool_t
+UBool
Calendar::before(const Calendar& when, UErrorCode& status) const
{
return (this != &when &&
@@ -302,7 +302,7 @@ Calendar::before(const Calendar& when, UErrorCode& status) const
// -------------------------------------
-bool_t
+UBool
Calendar::after(const Calendar& when, UErrorCode& status) const
{
return (this != &when &&
@@ -310,7 +310,7 @@ Calendar::after(const Calendar& when, UErrorCode& status) const
}
// {sfb} not in Java API, but looks similar to operator==
-bool_t
+UBool
Calendar::equivalentTo(const Calendar& other) const
{
// Return true if another Calendar object is equivalent to this one. An equivalent
@@ -469,7 +469,7 @@ Calendar::clear(EDateFields field)
// -------------------------------------
-bool_t
+UBool
Calendar::isSet(EDateFields field) const
{
return fStamp[field] != kUnset;
@@ -534,14 +534,14 @@ Calendar::orphanTimeZone()
// -------------------------------------
void
-Calendar::setLenient(bool_t lenient)
+Calendar::setLenient(UBool lenient)
{
fLenient = lenient;
}
// -------------------------------------
-bool_t
+UBool
Calendar::isLenient() const
{
return fLenient;
diff --git a/icu4c/source/i18n/chbkdat.cpp b/icu4c/source/i18n/chbkdat.cpp
index 9143c4fb4b4..4c6dd50422e 100644
--- a/icu4c/source/i18n/chbkdat.cpp
+++ b/icu4c/source/i18n/chbkdat.cpp
@@ -175,7 +175,7 @@ SpecialMapping TextBoundaryData::kCharacterExceptionChar[] = {
const int32_t TextBoundaryData::kCharacterExceptionChar_length =
sizeof(TextBoundaryData::kCharacterExceptionChar) / sizeof(TextBoundaryData::kCharacterExceptionChar[0]);
-const bool_t TextBoundaryData::kCharacterExceptionFlags[] = {
+const UBool TextBoundaryData::kCharacterExceptionFlags[] = {
FALSE, // kNonCharacter = 0,
FALSE, // kUppercaseLetter = 1,
FALSE, // kLowercaseLetter = 2,
diff --git a/icu4c/source/i18n/choicfmt.cpp b/icu4c/source/i18n/choicfmt.cpp
index f85e51f9cff..a6c16e38cc5 100644
--- a/icu4c/source/i18n/choicfmt.cpp
+++ b/icu4c/source/i18n/choicfmt.cpp
@@ -18,7 +18,7 @@
* wchar.h.
* 07/09/97 helena Made ParsePosition into a class.
* 08/06/97 nos removed overloaded constructor, fixed 'format(array)'
-* 07/22/98 stephen JDK 1.2 Sync - removed bool_t array (doubleFlags)
+* 07/22/98 stephen JDK 1.2 Sync - removed UBool array (doubleFlags)
* 02/22/99 stephen Removed character literals for EBCDIC safety
********************************************************************************
*/
@@ -75,7 +75,7 @@ ChoiceFormat::ChoiceFormat(const ChoiceFormat& that)
// -------------------------------------
-bool_t
+UBool
ChoiceFormat::operator==(const Format& that) const
{
if (this == &that) return TRUE;
@@ -239,7 +239,7 @@ ChoiceFormat::applyPattern(const UnicodeString& newPattern,
int32_t part = 0;
double startValue = 0;
double oldStartValue = uprv_getNaN();
- bool_t inQuote = FALSE;
+ UBool inQuote = FALSE;
for(int i = 0; i < newPattern.length(); ++i) {
UChar ch = newPattern[i];
if(ch == 0x0027 /*'\''*/) {
@@ -358,7 +358,7 @@ ChoiceFormat::toPattern(UnicodeString& result) const
// Append fChoiceFormats[i], using quotes if there are special characters.
// Single quotes themselves must be escaped in either case.
UnicodeString text = fChoiceFormats[i];
- bool_t needQuote = text.indexOf((UChar)0x003C /*'<'*/) >= 0
+ UBool needQuote = text.indexOf((UChar)0x003C /*'<'*/) >= 0
|| text.indexOf((UChar)0x0023 /*'#'*/) >= 0
|| text.indexOf((UChar32)0x2264) >= 0
|| text.indexOf((UChar)0x007C /*'|'*/) >= 0;
@@ -573,7 +573,7 @@ ChoiceFormat::clone() const
// -------------------------------------
double
-ChoiceFormat::nextDouble( double d, bool_t positive )
+ChoiceFormat::nextDouble( double d, UBool positive )
{
return uprv_nextDouble( d, positive );
}
diff --git a/icu4c/source/i18n/coleitr.cpp b/icu4c/source/i18n/coleitr.cpp
index bc917d678ac..e14304b3402 100644
--- a/icu4c/source/i18n/coleitr.cpp
+++ b/icu4c/source/i18n/coleitr.cpp
@@ -183,7 +183,7 @@ CollationElementIterator::~CollationElementIterator()
delete reorderBuffer;
}
-bool_t
+UBool
CollationElementIterator::operator==(const CollationElementIterator& that) const
{
if (this == &that)
@@ -215,7 +215,7 @@ CollationElementIterator::operator==(const CollationElementIterator& that) const
return TRUE;
}
-bool_t
+UBool
CollationElementIterator::operator!=(const CollationElementIterator& other) const
{
return !(*this == other);
@@ -598,7 +598,7 @@ int32_t CollationElementIterator::prevContractChar(UChar ch,
VectorOfInt* CollationElementIterator::makeReorderedBuffer(UChar colFirst,
int32_t lastValue,
VectorOfInt* lastExpansion,
- bool_t forward,
+ UBool forward,
UErrorCode& status) {
VectorOfInt* result;
diff --git a/icu4c/source/i18n/coll.cpp b/icu4c/source/i18n/coll.cpp
index 9fde167070d..e602bdd8d22 100644
--- a/icu4c/source/i18n/coll.cpp
+++ b/icu4c/source/i18n/coll.cpp
@@ -123,19 +123,19 @@ Collator::createInstance(const Locale& desiredLocale,
return collation;
}
-bool_t
+UBool
Collator::equals(const UnicodeString& source,
const UnicodeString& target) const
{
return (compare(source, target) == Collator::EQUAL);
}
-bool_t
+UBool
Collator::greaterOrEqual(const UnicodeString& source,
const UnicodeString& target) const
{
return (compare(source, target) != Collator::LESS);
}
-bool_t
+UBool
Collator::greater(const UnicodeString& source,
const UnicodeString& target) const
{
diff --git a/icu4c/source/i18n/cpdtrans.cpp b/icu4c/source/i18n/cpdtrans.cpp
index 5dec9aa03a8..8b49eac4da8 100644
--- a/icu4c/source/i18n/cpdtrans.cpp
+++ b/icu4c/source/i18n/cpdtrans.cpp
@@ -261,7 +261,7 @@ void CompoundTransliterator::adoptFilter(UnicodeFilter* f) {
* Implements {@link Transliterator#handleTransliterate}.
*/
void CompoundTransliterator::handleTransliterate(Replaceable& text, Position& index,
- bool_t incremental) const {
+ UBool incremental) const {
/* Call each transliterator with the same start value and
* initial cursor index, but with the limit index as modified
* by preceding transliterators. The cursor index must be
diff --git a/icu4c/source/i18n/datefmt.cpp b/icu4c/source/i18n/datefmt.cpp
index 0c2b1c4fcfe..e5bdc913912 100644
--- a/icu4c/source/i18n/datefmt.cpp
+++ b/icu4c/source/i18n/datefmt.cpp
@@ -68,7 +68,7 @@ DateFormat::~DateFormat()
//----------------------------------------------------------------------
-bool_t
+UBool
DateFormat::operator==(const Format& other) const
{
// This protected comparison operator should only be called by subclasses
@@ -348,14 +348,14 @@ DateFormat::getTimeZone() const
//----------------------------------------------------------------------
void
-DateFormat::setLenient(bool_t lenient)
+DateFormat::setLenient(UBool lenient)
{
fCalendar->setLenient(lenient);
}
//----------------------------------------------------------------------
-bool_t
+UBool
DateFormat::isLenient() const
{
return fCalendar->isLenient();
diff --git a/icu4c/source/i18n/dbbi.cpp b/icu4c/source/i18n/dbbi.cpp
index f11f450a000..398f96f4411 100644
--- a/icu4c/source/i18n/dbbi.cpp
+++ b/icu4c/source/i18n/dbbi.cpp
@@ -302,7 +302,7 @@ DictionaryBasedBreakIterator::divideUpDictionaryRange(int32_t startPos, int32_t
// the character where the error occurred.
int32_t farthestEndPoint = text->getIndex();
UStack bestBreakPositions;
- bool_t bestBreakPositionsInitialized = FALSE;
+ UBool bestBreakPositionsInitialized = FALSE;
// initialize (we always exit the loop with a break statement)
c = text->current();
diff --git a/icu4c/source/i18n/dcfmtsym.cpp b/icu4c/source/i18n/dcfmtsym.cpp
index 880e0fcce23..1478ae82619 100644
--- a/icu4c/source/i18n/dcfmtsym.cpp
+++ b/icu4c/source/i18n/dcfmtsym.cpp
@@ -140,7 +140,7 @@ DecimalFormatSymbols::operator=(const DecimalFormatSymbols& rhs)
// -------------------------------------
-bool_t
+UBool
DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
{
if (this == &that) return TRUE;
@@ -168,7 +168,7 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
void
DecimalFormatSymbols::initialize(const Locale& locale, UErrorCode& status,
- bool_t useLastResortData)
+ UBool useLastResortData)
{
if (U_FAILURE(status)) return;
diff --git a/icu4c/source/i18n/decimfmt.cpp b/icu4c/source/i18n/decimfmt.cpp
index 6dd4efe6def..8e444e6c564 100644
--- a/icu4c/source/i18n/decimfmt.cpp
+++ b/icu4c/source/i18n/decimfmt.cpp
@@ -306,7 +306,7 @@ DecimalFormat::operator=(const DecimalFormat& rhs)
//------------------------------------------------------------------------------
-bool_t
+UBool
DecimalFormat::operator==(const Format& that) const
{
if (this == &that) return TRUE;
@@ -318,7 +318,7 @@ DecimalFormat::operator==(const Format& that) const
#if 0
// This code makes it easy to determine why two format objects that should
// be equal aren't.
- bool_t first = TRUE;
+ UBool first = TRUE;
if (!NumberFormat::operator==(that)) {
if (first) { printf("[ "); first = FALSE; } else { printf(", "); }
debug("NumberFormat::!=");
@@ -471,7 +471,7 @@ DecimalFormat::format(int32_t number,
return format((double) number, result, fieldPosition);
}
- bool_t isNegative = (number < 0);
+ UBool isNegative = (number < 0);
if (isNegative) number = -number; // NOTE: number will still be negative if it is LONG_MIN
// In general, long values always represent real finite numbers, so
@@ -482,7 +482,7 @@ DecimalFormat::format(int32_t number,
// instead, trading off accuracy for range.
if (fMultiplier != 1 && fMultiplier != 0)
{
- bool_t useDouble = FALSE;
+ UBool useDouble = FALSE;
if (number < 0) // This can only happen if number == Long.MIN_VALUE
{
@@ -549,7 +549,7 @@ DecimalFormat::format( double number,
* -Infinity. Proper detection of -0.0 is needed to deal with the
* issues raised by bugs 4106658, 4106667, and 4147706. Liu 7/6/98.
*/
- bool_t isNegative = uprv_isNegative(number);
+ UBool isNegative = uprv_isNegative(number);
if (isNegative) number = -number;
// Do this BEFORE checking to see if value is infinite! Sets the
@@ -606,7 +606,7 @@ DecimalFormat::format( double number,
* @param isNegative true if the number to be rounded is negative
* @return the absolute value of the rounded result
*/
-double DecimalFormat::round(double a, ERoundingMode mode, bool_t isNegative) {
+double DecimalFormat::round(double a, ERoundingMode mode, UBool isNegative) {
switch (mode) {
case kRoundCeiling:
return isNegative ? uprv_floor(a) : uprv_ceil(a);
@@ -651,8 +651,8 @@ DecimalFormat::format( const Formattable& obj,
UnicodeString&
DecimalFormat::subformat(UnicodeString& result,
FieldPosition& fieldPosition,
- bool_t isNegative,
- bool_t isInteger) const
+ UBool isNegative,
+ UBool isInteger) const
{
// Gets the localized zero Unicode character.
UChar zero = fSymbols->getZeroDigit();
@@ -775,7 +775,7 @@ DecimalFormat::subformat(UnicodeString& result,
// is used to determine integer digit count above.
if (fDigitList->isZero()) exponent = 0;
- bool_t negativeExponent = exponent < 0;
+ UBool negativeExponent = exponent < 0;
if (negativeExponent) {
exponent = -exponent;
result += fSymbols->getMinusSign();
@@ -851,7 +851,7 @@ DecimalFormat::subformat(UnicodeString& result,
// Determine whether or not there are any printable fractional
// digits. If we've used up the digits we know there aren't.
- bool_t fractionPresent = (getMinimumFractionDigits() > 0) ||
+ UBool fractionPresent = (getMinimumFractionDigits() > 0) ||
(!isInteger && digitIndex < fDigitList->fCount);
// If there is no fraction present, and we haven't printed any
@@ -921,8 +921,8 @@ DecimalFormat::subformat(UnicodeString& result,
* @param isNegative must be true if result contains a formatted negative
* number, and false otherwise. Ignored if hasAffixes is false.
*/
-void DecimalFormat::addPadding(UnicodeString& result, bool_t hasAffixes,
- bool_t isNegative) const {
+void DecimalFormat::addPadding(UnicodeString& result, UBool hasAffixes,
+ UBool isNegative) const {
if (fFormatWidth > 0) {
int32_t len = fFormatWidth - result.length();
if (len > 0) {
@@ -1000,7 +1000,7 @@ DecimalFormat::parse(const UnicodeString& text,
// status is used to record whether a number is
// infinite or positive.
- bool_t status[fgStatusLength];
+ UBool status[fgStatusLength];
if (!subparse(text, parsePosition, *fDigitList, FALSE, status)) {
parsePosition.setIndex(backup);
@@ -1059,18 +1059,18 @@ DecimalFormat::parse(const UnicodeString& text,
* @param status Upon return contains boolean status flags indicating
* whether the value was infinite and whether it was positive.
*/
-bool_t DecimalFormat::subparse(const UnicodeString& text, ParsePosition& parsePosition,
- DigitList& digits, bool_t isExponent,
- bool_t* status) const
+UBool DecimalFormat::subparse(const UnicodeString& text, ParsePosition& parsePosition,
+ DigitList& digits, UBool isExponent,
+ UBool* status) const
{
int32_t position = parsePosition.getIndex();
int32_t oldStart = parsePosition.getIndex();
int32_t backup;
// check for positivePrefix; take longest
- bool_t gotPositive = text.compare(position,fPositivePrefix.length(),fPositivePrefix,0,
+ UBool gotPositive = text.compare(position,fPositivePrefix.length(),fPositivePrefix,0,
fPositivePrefix.length()) == 0;
- bool_t gotNegative = text.compare(position,fNegativePrefix.length(),fNegativePrefix,0,
+ UBool gotNegative = text.compare(position,fNegativePrefix.length(),fNegativePrefix,0,
fNegativePrefix.length()) == 0;
// If the number is positive and negative at the same time,
// 1. the number is positive if the positive prefix is longer
@@ -1115,9 +1115,9 @@ bool_t DecimalFormat::subparse(const UnicodeString& text, ParsePosition& parsePo
fSymbols->getMonetaryDecimalSeparator() : fSymbols->getDecimalSeparator();
UChar grouping = fSymbols->getGroupingSeparator();
UChar exponentChar = fSymbols->getExponentialSymbol();
- bool_t sawDecimal = FALSE;
- bool_t sawExponent = FALSE;
- bool_t sawDigit= FALSE;
+ UBool sawDecimal = FALSE;
+ UBool sawExponent = FALSE;
+ UBool sawDigit= FALSE;
int32_t exponent = 0; // Set to the exponent value, if any
// We have to track digitCount ourselves, because digits.fCount will
@@ -1195,7 +1195,7 @@ bool_t DecimalFormat::subparse(const UnicodeString& text, ParsePosition& parsePo
else if (!isExponent && ch == exponentChar && !sawExponent)
{
// Parse sign, if present
- bool_t negExp = FALSE;
+ UBool negExp = FALSE;
int32_t pos = position + 1; // position + exponentSep.length();
if (pos < text.length()) {
ch = text[(UTextOffset) pos];
@@ -1602,7 +1602,7 @@ void DecimalFormat::setPadPosition(EPadPosition padPos) {
* @see #isExponentSignAlwaysShown
* @see #setExponentSignAlwaysShown
*/
-bool_t DecimalFormat::isScientificNotation() {
+UBool DecimalFormat::isScientificNotation() {
return fUseExponentialNotation;
}
@@ -1616,7 +1616,7 @@ bool_t DecimalFormat::isScientificNotation() {
* @see #isExponentSignAlwaysShown
* @see #setExponentSignAlwaysShown
*/
-void DecimalFormat::setScientificNotation(bool_t useScientific) {
+void DecimalFormat::setScientificNotation(UBool useScientific) {
fUseExponentialNotation = useScientific;
if (fUseExponentialNotation && fMinExponentDigits < 1) {
fMinExponentDigits = 1;
@@ -1662,7 +1662,7 @@ void DecimalFormat::setMinimumExponentDigits(int8_t minExpDig) {
* @see #getMinimumExponentDigits
* @see #setExponentSignAlwaysShown
*/
-bool_t DecimalFormat::isExponentSignAlwaysShown() {
+UBool DecimalFormat::isExponentSignAlwaysShown() {
return fExponentSignAlwaysShown;
}
@@ -1678,7 +1678,7 @@ bool_t DecimalFormat::isExponentSignAlwaysShown() {
* @see #getMinimumExponentDigits
* @see #isExponentSignAlwaysShown
*/
-void DecimalFormat::setExponentSignAlwaysShown(bool_t expSignAlways) {
+void DecimalFormat::setExponentSignAlwaysShown(UBool expSignAlways) {
fExponentSignAlwaysShown = expSignAlways;
}
@@ -1704,7 +1704,7 @@ DecimalFormat::setGroupingSize(int32_t newValue)
//------------------------------------------------------------------------------
// Checks if to show the decimal separator.
-bool_t
+UBool
DecimalFormat::isDecimalSeparatorAlwaysShown() const
{
return fDecimalSeparatorAlwaysShown;
@@ -1714,7 +1714,7 @@ DecimalFormat::isDecimalSeparatorAlwaysShown() const
// Sets to always show the decimal separator.
void
-DecimalFormat::setDecimalSeparatorAlwaysShown(bool_t newValue)
+DecimalFormat::setDecimalSeparatorAlwaysShown(UBool newValue)
{
fDecimalSeparatorAlwaysShown = newValue;
}
@@ -1839,7 +1839,7 @@ void DecimalFormat::expandAffix(const UnicodeString& pattern,
void DecimalFormat::appendAffix(UnicodeString& buffer,
const UnicodeString* affixPattern,
const UnicodeString& expAffix,
- bool_t localized) const {
+ UBool localized) const {
if (affixPattern == 0) {
appendAffix(buffer, expAffix, localized);
} else {
@@ -1897,8 +1897,8 @@ void DecimalFormat::appendAffix(UnicodeString& buffer,
void
DecimalFormat::appendAffix( UnicodeString& buffer,
const UnicodeString& affix,
- bool_t localized) const {
- bool_t needQuote;
+ UBool localized) const {
+ UBool needQuote;
if(localized) {
needQuote = affix.indexOf(fSymbols->getZeroDigit()) >= 0
|| affix.indexOf(fSymbols->getGroupingSeparator()) >= 0
@@ -1946,7 +1946,7 @@ DecimalFormat::appendAffix( UnicodeString& buffer,
#endif
UnicodeString&
-DecimalFormat::toPattern(UnicodeString& result, bool_t localized) const
+DecimalFormat::toPattern(UnicodeString& result, UBool localized) const
{
result.remove();
UChar zero = localized ? fSymbols->getZeroDigit() : kPatternZeroDigit;
@@ -2050,7 +2050,7 @@ DecimalFormat::toPattern(UnicodeString& result, bool_t localized) const
if (fPadPosition == kPadAfterSuffix && ! padSpec.empty()) {
result.append(padSpec);
}
- bool_t isDefault = FALSE;
+ UBool isDefault = FALSE;
if ((fNegSuffixPattern == fPosSuffixPattern && // both null
fNegativeSuffix == fPositiveSuffix)
|| (fNegSuffixPattern != 0 && fPosSuffixPattern != 0 &&
@@ -2107,7 +2107,7 @@ DecimalFormat::applyLocalizedPattern(const UnicodeString& pattern, UErrorCode& s
void
DecimalFormat::applyPattern(const UnicodeString& pattern,
- bool_t localized,
+ UBool localized,
UErrorCode& status)
{
if (U_FAILURE(status)) return;
@@ -2167,14 +2167,14 @@ DecimalFormat::applyPattern(const UnicodeString& pattern,
int32_t roundingPos = -1;
DigitList roundingInc;
int8_t expDigits = -1;
- bool_t expSignAlways = FALSE;
- bool_t isCurrency = FALSE;
+ UBool expSignAlways = FALSE;
+ UBool isCurrency = FALSE;
// The affix is either the prefix or the suffix.
UnicodeString* affix = &prefix;
int32_t start = pos;
- bool_t isPartDone = FALSE;
+ UBool isPartDone = FALSE;
for (; !isPartDone && pos < pattern.length(); ++pos) {
UChar ch = pattern[(UTextOffset) pos];
@@ -2297,7 +2297,7 @@ DecimalFormat::applyPattern(const UnicodeString& pattern,
} else if (ch == kCurrencySign) {
// Use lookahead to determine if the currency sign is
// doubled or not.
- bool_t doubled = (pos + 1) < pattern.length() &&
+ UBool doubled = (pos + 1) < pattern.length() &&
pattern[(UTextOffset) (pos+1)] == kCurrencySign;
affix->append(kQuote); // Encode currency
if (doubled) {
diff --git a/icu4c/source/i18n/digitlst.cpp b/icu4c/source/i18n/digitlst.cpp
index 47c5bac8551..6d75e617dbc 100644
--- a/icu4c/source/i18n/digitlst.cpp
+++ b/icu4c/source/i18n/digitlst.cpp
@@ -80,7 +80,7 @@ DigitList::operator=(const DigitList& other)
// -------------------------------------
-bool_t
+UBool
DigitList::operator==(const DigitList& that) const
{
return ((this == &that) ||
@@ -144,8 +144,8 @@ int32_t DigitList::getLong() const
* Return true if the number represented by this object can fit into
* a long.
*/
-bool_t
-DigitList::fitsIntoLong(bool_t isPositive, bool_t ignoreNegativeZero)
+UBool
+DigitList::fitsIntoLong(UBool isPositive, UBool ignoreNegativeZero)
{
// Figure out if the result will fit in a long. We have to
// first look for nonzero digits after the decimal point;
@@ -250,7 +250,7 @@ DigitList::set(int32_t source, int32_t maximumDigits)
* fractional digits to be converted. If false, total digits.
*/
void
-DigitList::set(double source, int32_t maximumDigits, bool_t fixedPoint)
+DigitList::set(double source, int32_t maximumDigits, UBool fixedPoint)
{
if(source == 0) source = 0;
// Generate a representation of the form DDDDD, DDDDD.DDDDD, or
@@ -265,7 +265,7 @@ DigitList::set(double source, int32_t maximumDigits, bool_t fixedPoint)
// Number of zeros between decimal point and first non-zero digit after
// decimal point, for numbers < 1.
int32_t leadingZerosAfterDecimal = 0;
- bool_t nonZeroDigitSeen = FALSE;
+ UBool nonZeroDigitSeen = FALSE;
for (int32_t i=0; i < MAX_DIGITS + 7; ++i) {
char c = rep[i];
if (c == '.') {
@@ -275,7 +275,7 @@ DigitList::set(double source, int32_t maximumDigits, bool_t fixedPoint)
// Parse an exponent of the form /[eE][+-]?[0-9]*/
//exponent = Integer.valueOf(rep.substring(i+1)).intValue();
i += 1; // adjust for 'e'
- bool_t negExp = rep[i] == '-';
+ UBool negExp = rep[i] == '-';
if (negExp || rep[i] == '+') {
++i;
}
@@ -412,7 +412,7 @@ DigitList::round(int32_t maximumDigits)
* @return true if digit maximumDigits-1 should be
* incremented
*/
-bool_t DigitList::shouldRoundUp(int32_t maximumDigits) {
+UBool DigitList::shouldRoundUp(int32_t maximumDigits) {
// Implement IEEE half-even rounding
if (fDigits[maximumDigits] > '5') {
return TRUE;
@@ -481,7 +481,7 @@ bool_t DigitList::shouldRoundUp(int32_t maximumDigits) {
* Return true if this object represents the value zero. Anything with
* no digits, or all zero digits, is zero, regardless of fDecimalAt.
*/
-bool_t
+UBool
DigitList::isZero() const
{
for (int32_t i=0; i= fGregorianCutoverYear ?
@@ -380,14 +380,14 @@ GregorianCalendar::isLeapYear(int32_t year) const
* @param theTime the given time as LOCAL milliseconds, not UTC.
*/
void
-GregorianCalendar::timeToFields(UDate theTime, bool_t quick, UErrorCode& status)
+GregorianCalendar::timeToFields(UDate theTime, UBool quick, UErrorCode& status)
{
if (U_FAILURE(status))
return;
int32_t rawYear;
int32_t year, yearOfWeekOfYear, month, date, dayOfWeek, locDayOfWeek, dayOfYear, era;
- bool_t isLeap;
+ UBool isLeap;
// Compute the year, month, and day of month from the given millis
if (theTime >= fNormalizedGregorianCutover) {
@@ -722,7 +722,7 @@ GregorianCalendar::pinDayOfMonth()
// -------------------------------------
-bool_t
+UBool
GregorianCalendar::validateFields() const
{
for (int32_t field = 0; field < FIELD_COUNT; field++) {
@@ -762,7 +762,7 @@ GregorianCalendar::validateFields() const
// -------------------------------------
-bool_t
+UBool
GregorianCalendar::boundsCheck(int32_t value, EDateFields field) const
{
return value >= getMinimum(field) && value <= getMaximum(field);
@@ -826,7 +826,7 @@ GregorianCalendar::computeTime(UErrorCode& status)
// calendar Oct. 4 (Julian) is followed by Oct. 15 (Gregorian). This
// algorithm will interpret such a date using the Julian calendar,
// yielding Oct. 20, 1582 (Gregorian).
- bool_t isGregorian = year >= fGregorianCutoverYear;
+ UBool isGregorian = year >= fGregorianCutoverYear;
double julianDay = computeJulianDay(isGregorian, year);
double millis = julianDayToMillis(julianDay);
@@ -965,8 +965,8 @@ GregorianCalendar::computeTime(UErrorCode& status)
* specifies (Jan. 1, 1) - 1, in whatever calendar we are using (Julian
* or Gregorian).
*/
-double GregorianCalendar::computeJulianDayOfYear(bool_t isGregorian,
- int32_t year, bool_t& isLeap) {
+double GregorianCalendar::computeJulianDayOfYear(UBool isGregorian,
+ int32_t year, UBool& isLeap) {
isLeap = year%4 == 0;
int32_t y = year - 1;
double julianDay = 365.0*y + floorDivide(y, 4) + (kJan1_1JulianDay - 3);
@@ -1034,7 +1034,7 @@ int32_t GregorianCalendar::computeDOYfromWOY(double julianDayOfYear) const {
}
double
-GregorianCalendar::computeJulianDay(bool_t isGregorian, int32_t year)
+GregorianCalendar::computeJulianDay(UBool isGregorian, int32_t year)
{
// Find the most recent set of fields specifying the day within
// the year. These may be any of the following combinations:
@@ -1055,7 +1055,7 @@ GregorianCalendar::computeJulianDay(bool_t isGregorian, int32_t year)
int32_t doyStamp = fStamp[DAY_OF_YEAR];
int32_t woyStamp = fStamp[WEEK_OF_YEAR];
- bool_t isLeap;
+ UBool isLeap;
double julianDay;
int32_t bestStamp = (monthStamp > domStamp) ? monthStamp : domStamp;
@@ -1168,7 +1168,7 @@ GregorianCalendar::computeJulianDay(bool_t isGregorian, int32_t year)
// The following if() clause checks if the month field
// predominates. This set of computations must be done BEFORE
// using the year, since the year value may be adjusted here.
- bool_t useMonth = FALSE;
+ UBool useMonth = FALSE;
int32_t month = 0;
if (bestStamp != kUnset &&
(bestStamp == monthStamp ||
@@ -1262,7 +1262,7 @@ GregorianCalendar::computeJulianDay(bool_t isGregorian, int32_t year)
// No month, start with January 0 (day before Jan 1), then adjust.
int32_t doy = 0;
- bool_t doCutoverAdjustment = TRUE;
+ UBool doCutoverAdjustment = TRUE;
if (bestStamp == kUnset) {
doy = 1; // Advance to January 1
@@ -1430,7 +1430,7 @@ GregorianCalendar::add(EDateFields field, int32_t amount, UErrorCode& status)
// WEEK_OF_YEAR clause below, if delta was greater than approx.
// 7.1 we would reach the limit of a int32_t
double delta = amount;
- bool_t adjustDST = TRUE;
+ UBool adjustDST = TRUE;
switch (field) {
case WEEK_OF_YEAR:
@@ -1520,7 +1520,7 @@ GregorianCalendar::roll(EDateFields field, int32_t amount, UErrorCode& status)
/* Some of the fields require special handling to work in the month
* containing the Gregorian cutover point. Do shared computations
* for these fields here. [j81 - aliu] */
- bool_t inCutoverMonth = FALSE;
+ UBool inCutoverMonth = FALSE;
int32_t cMonthLen; // 'c' for cutover; in days
int32_t cDayOfMonth; // no discontinuity: [0, cMonthLen)
double cMonthStart; // in ms
@@ -1990,7 +1990,7 @@ GregorianCalendar::getActualMaximum(EDateFields field) const
// -------------------------------------
-bool_t
+UBool
GregorianCalendar::inDaylightTime(UErrorCode& status) const
{
if (U_FAILURE(status) || !getTimeZone().useDaylightTime())
diff --git a/icu4c/source/i18n/hangjamo.cpp b/icu4c/source/i18n/hangjamo.cpp
index aa2b6b131c3..7b047942dec 100644
--- a/icu4c/source/i18n/hangjamo.cpp
+++ b/icu4c/source/i18n/hangjamo.cpp
@@ -63,7 +63,7 @@ Transliterator* HangulJamoTransliterator::clone(void) const {
* Implements {@link Transliterator#handleTransliterate}.
*/
void HangulJamoTransliterator::handleTransliterate(Replaceable& text, Position& offsets,
- bool_t isIncremental) const {
+ UBool isIncremental) const {
int32_t cursor = offsets.cursor;
int32_t limit = offsets.limit;
@@ -83,7 +83,7 @@ void HangulJamoTransliterator::handleTransliterate(Replaceable& text, Position&
offsets.cursor = cursor;
}
-bool_t HangulJamoTransliterator::decomposeHangul(UChar s, UnicodeString& result) {
+UBool HangulJamoTransliterator::decomposeHangul(UChar s, UnicodeString& result) {
int32_t SIndex = s - SBase;
if (0 > SIndex || SIndex >= SCount) {
return FALSE;
diff --git a/icu4c/source/i18n/hextouni.cpp b/icu4c/source/i18n/hextouni.cpp
index abd758a44f8..636ebd58213 100644
--- a/icu4c/source/i18n/hextouni.cpp
+++ b/icu4c/source/i18n/hextouni.cpp
@@ -131,7 +131,7 @@ void HexToUnicodeTransliterator::applyPattern(const UnicodeString& thePattern,
* create a virtual ';' if necessary.
*/
UChar c; // These are outside the loop so we can see the
- bool_t isLiteral; // previous character...
+ UBool isLiteral; // previous character...
for (int32_t i=0; i<=pattern.length(); ++i) {
// Create the virtual trailing ';' if necessary
if (i == pattern.length()) {
@@ -238,7 +238,7 @@ const UnicodeString& HexToUnicodeTransliterator::toPattern(void) const {
}
void HexToUnicodeTransliterator::handleTransliterate(Replaceable& text, Position& offsets,
- bool_t isIncremental) const {
+ UBool isIncremental) const {
int32_t cursor = offsets.cursor;
int32_t limit = offsets.limit;
int32_t i, j, ipat;
@@ -263,7 +263,7 @@ void HexToUnicodeTransliterator::handleTransliterate(Replaceable& text, Position
// curs is a copy of cursor that is advanced over the
// characters as we parse them.
int32_t curs = cursor;
- bool_t match = TRUE;
+ UBool match = TRUE;
for (i=0; i= limit) {
diff --git a/icu4c/source/i18n/jamohang.cpp b/icu4c/source/i18n/jamohang.cpp
index feff7bde2b2..3cd690a0ee3 100644
--- a/icu4c/source/i18n/jamohang.cpp
+++ b/icu4c/source/i18n/jamohang.cpp
@@ -52,7 +52,7 @@ Transliterator* JamoHangulTransliterator::clone(void) const {
* Implements {@link Transliterator#handleTransliterate}.
*/
void JamoHangulTransliterator::handleTransliterate(Replaceable& text, Position& offsets,
- bool_t isIncremental) const {
+ UBool isIncremental) const {
/**
* Performs transliteration changing Jamo to Hangul
*/
diff --git a/icu4c/source/i18n/lnbkdat.cpp b/icu4c/source/i18n/lnbkdat.cpp
index fe3176ed234..c966045248d 100644
--- a/icu4c/source/i18n/lnbkdat.cpp
+++ b/icu4c/source/i18n/lnbkdat.cpp
@@ -281,7 +281,7 @@ SpecialMapping TextBoundaryData::kLineExceptionChar[] = {
const int32_t TextBoundaryData::kLineExceptionChar_length =
sizeof(TextBoundaryData::kLineExceptionChar)/sizeof(TextBoundaryData::kLineExceptionChar[0]);
-const bool_t TextBoundaryData::kLineExceptionFlags[] = {
+const UBool TextBoundaryData::kLineExceptionFlags[] = {
FALSE, // kNonCharacter = 0,
FALSE, // kUppercaseLetter = 1,
FALSE, // kLowercaseLetter = 2,
diff --git a/icu4c/source/i18n/mergecol.cpp b/icu4c/source/i18n/mergecol.cpp
index e4adeb8e889..b3e91948d61 100644
--- a/icu4c/source/i18n/mergecol.cpp
+++ b/icu4c/source/i18n/mergecol.cpp
@@ -143,7 +143,7 @@ MergeCollation::~MergeCollation()
* before & and <
*/
UnicodeString&
-MergeCollation::getPattern(UnicodeString& result, bool_t withWhiteSpace) const
+MergeCollation::getPattern(UnicodeString& result, UBool withWhiteSpace) const
{
int32_t i;
@@ -219,7 +219,7 @@ MergeCollation::getPattern(UnicodeString& result, bool_t withWhiteSpace) const
* builder.
*/
UnicodeString&
-MergeCollation::emitPattern(UnicodeString& result, bool_t withWhiteSpace) const
+MergeCollation::emitPattern(UnicodeString& result, UBool withWhiteSpace) const
{
int32_t i;
@@ -339,7 +339,7 @@ void MergeCollation::fixEntry(PatternEntry* newEntry,
UErrorCode& success)
{
UnicodeString excess;
- bool_t changeLastEntry = TRUE;
+ UBool changeLastEntry = TRUE;
if (newEntry->strength != PatternEntry::RESET)
{
diff --git a/icu4c/source/i18n/mergecol.h b/icu4c/source/i18n/mergecol.h
index d724937a6b1..bbe639a293e 100644
--- a/icu4c/source/i18n/mergecol.h
+++ b/icu4c/source/i18n/mergecol.h
@@ -98,7 +98,7 @@ public:
* before & and <
* @return the recovered result.
*/
- UnicodeString& getPattern(UnicodeString& pattern, bool_t withWhiteSpace) const;
+ UnicodeString& getPattern(UnicodeString& pattern, UBool withWhiteSpace) const;
/**
* Emits the pattern for collation builder.
@@ -116,7 +116,7 @@ public:
* @return Emits the string in the format understable to the collation
* builder.
*/
- UnicodeString& emitPattern(UnicodeString& pattern, bool_t withWhiteSpace) const;
+ UnicodeString& emitPattern(UnicodeString& pattern, UBool withWhiteSpace) const;
/**
* Sets the pattern.
diff --git a/icu4c/source/i18n/msgfmt.cpp b/icu4c/source/i18n/msgfmt.cpp
index 4aab1db4edb..477f48d1463 100644
--- a/icu4c/source/i18n/msgfmt.cpp
+++ b/icu4c/source/i18n/msgfmt.cpp
@@ -147,7 +147,7 @@ MessageFormat::operator=(const MessageFormat& that)
return *this;
}
-bool_t
+UBool
MessageFormat::operator==(const Format& that) const
{
if (this == &that) return TRUE;
@@ -217,7 +217,7 @@ MessageFormat::applyPattern(const UnicodeString& newPattern,
UnicodeString segments[4];
int32_t part = 0;
int32_t formatNumber = 0;
- bool_t inQuote = FALSE;
+ UBool inQuote = FALSE;
int32_t braceStack = 0;
fMaxOffset = -1;
for (int i = 0; i < newPattern.length(); ++i) {
@@ -603,7 +603,7 @@ MessageFormat::format(const Formattable* arguments,
Formattable obj = arguments[argumentNumber];
UnicodeString arg;
- bool_t tryRecursion = FALSE;
+ UBool tryRecursion = FALSE;
// Recursively calling the format process only if the current format argument
// refers to a ChoiceFormat object.
if (fFormats[i] != NULL) {
@@ -1095,7 +1095,7 @@ MessageFormat::copyAndFixQuotes(const UnicodeString& source,
int32_t end,
UnicodeString& target)
{
- bool_t gotLB = FALSE;
+ UBool gotLB = FALSE;
for (UTextOffset i = start; i < end; ++i) {
UChar ch = source[i];
diff --git a/icu4c/source/i18n/nultrans.cpp b/icu4c/source/i18n/nultrans.cpp
index b197cf7ac47..289d482a144 100644
--- a/icu4c/source/i18n/nultrans.cpp
+++ b/icu4c/source/i18n/nultrans.cpp
@@ -21,6 +21,6 @@ int32_t NullTransliterator::transliterate(Replaceable&, int32_t,
}
void NullTransliterator::handleTransliterate(Replaceable& text, Position& offsets,
- bool_t isIncremental) const {
+ UBool isIncremental) const {
offsets.cursor = offsets.limit;
}
diff --git a/icu4c/source/i18n/numfmt.cpp b/icu4c/source/i18n/numfmt.cpp
index 8bbd903f323..04a8d030945 100644
--- a/icu4c/source/i18n/numfmt.cpp
+++ b/icu4c/source/i18n/numfmt.cpp
@@ -99,7 +99,7 @@ NumberFormat::operator=(const NumberFormat& rhs)
// -------------------------------------
-bool_t
+UBool
NumberFormat::operator==(const Format& that) const
{
NumberFormat* other = (NumberFormat*)&that;
@@ -198,7 +198,7 @@ NumberFormat::parse(const UnicodeString& text,
// Sets to only parse integers.
void
-NumberFormat::setParseIntegerOnly(bool_t value)
+NumberFormat::setParseIntegerOnly(UBool value)
{
fParseIntegerOnly = value;
}
@@ -287,7 +287,7 @@ NumberFormat::getAvailableLocales(int32_t& count)
// Checks if the thousand/10 thousand grouping is used in the
// NumberFormat instance.
-bool_t
+UBool
NumberFormat::isGroupingUsed() const
{
return fGroupingUsed;
@@ -298,7 +298,7 @@ NumberFormat::isGroupingUsed() const
// NumberFormat instance.
void
-NumberFormat::setGroupingUsed(bool_t newValue)
+NumberFormat::setGroupingUsed(UBool newValue)
{
fGroupingUsed = newValue;
}
diff --git a/icu4c/source/i18n/ptnentry.cpp b/icu4c/source/i18n/ptnentry.cpp
index afcd02565ea..ab634997467 100644
--- a/icu4c/source/i18n/ptnentry.cpp
+++ b/icu4c/source/i18n/ptnentry.cpp
@@ -95,8 +95,8 @@ void PatternEntry::appendQuotedChars(UnicodeString& toAddTo) const {
appendQuoted(chars,toAddTo);
}
-bool_t PatternEntry::equals(const PatternEntry& other) const {
- bool_t result = ((strength == other.strength) &&
+UBool PatternEntry::equals(const PatternEntry& other) const {
+ UBool result = ((strength == other.strength) &&
(chars == other.chars) &&
(extension == other.extension));
return result;
@@ -136,8 +136,8 @@ PatternEntry::getChars(UnicodeString& result) const
Add the entry in textual form into the toAddTo buffer.
*/
void PatternEntry::addToBuffer(UnicodeString& toAddTo,
- bool_t showExtension,
- bool_t showWhiteSpace,
+ UBool showExtension,
+ UBool showWhiteSpace,
const PatternEntry* lastEntry) const
{
if (showWhiteSpace && toAddTo.length() > 0)
@@ -177,7 +177,7 @@ void PatternEntry::addToBuffer(UnicodeString& toAddTo,
// Append a string to a pattern buffer, adding quotes if necessary
void PatternEntry::appendQuoted(const UnicodeString& chars, UnicodeString& toAddTo) {
- bool_t inQuote = FALSE;
+ UBool inQuote = FALSE;
UChar ch = chars[T_INT32(0)];
if (Unicode::isSpaceChar(ch)) {
inQuote = TRUE;
@@ -243,8 +243,8 @@ PatternEntry::Parser &PatternEntry::Parser::operator=(const Parser &that)
PatternEntry *PatternEntry::Parser::next(UErrorCode &status)
{
int32_t newStrength = PatternEntry::UNSET;
- bool_t inChars = TRUE;
- bool_t inQuote = FALSE;
+ UBool inChars = TRUE;
+ UBool inQuote = FALSE;
newChars.remove();
newExtensions.remove();
@@ -406,7 +406,7 @@ PatternEntry *PatternEntry::Parser::next(UErrorCode &status)
// Check if the character is a special character. A special character
// would be meaningful in the rule only if quoted, otherwise it's used
// as a denotation for strength or merging symbols.
-bool_t PatternEntry::isSpecialChar(UChar ch)
+UBool PatternEntry::isSpecialChar(UChar ch)
{
return (((ch <= 0x002F) && (ch >= 0x0020)) ||
((ch <= 0x003F) && (ch >= 0x003A)) ||
diff --git a/icu4c/source/i18n/ptnentry.h b/icu4c/source/i18n/ptnentry.h
index 219b28b9c68..72796e99b3d 100644
--- a/icu4c/source/i18n/ptnentry.h
+++ b/icu4c/source/i18n/ptnentry.h
@@ -56,7 +56,7 @@ class PatternEntry
* @param other the other pattern entry object.
* @return TRUE if the pattern entry objects are the same, FALSE otherwise.
*/
- bool_t equals(const PatternEntry& other) const;
+ UBool equals(const PatternEntry& other) const;
/**
* Gets the strength of this entry.
@@ -149,8 +149,8 @@ class PatternEntry
* @param lastEntry the last pattern entry that was referenced.
*/
void addToBuffer(UnicodeString& toAddTo,
- bool_t showExtension,
- bool_t showWhiteSpace,
+ UBool showExtension,
+ UBool showWhiteSpace,
const PatternEntry* lastEntry) const;
/**
@@ -173,7 +173,7 @@ class PatternEntry
* @param the Unicode character
* @return TRUE if the character is a special character, FALSE otherwise.
*/
- static bool_t isSpecialChar(UChar ch);
+ static UBool isSpecialChar(UChar ch);
int32_t strength;
UnicodeString chars;
diff --git a/icu4c/source/i18n/rbbi.cpp b/icu4c/source/i18n/rbbi.cpp
index ff7757b929a..1344317b467 100644
--- a/icu4c/source/i18n/rbbi.cpp
+++ b/icu4c/source/i18n/rbbi.cpp
@@ -113,7 +113,7 @@ RuleBasedBreakIterator::clone(void) const {
* Equality operator. Returns TRUE if both BreakIterators are of the
* same class, have the same behavior, and iterate over the same text.
*/
-bool_t
+UBool
RuleBasedBreakIterator::operator==(const BreakIterator& that) const {
if (that.getDynamicClassID() != getDynamicClassID())
return FALSE;
@@ -388,7 +388,7 @@ int32_t RuleBasedBreakIterator::preceding(int32_t offset) {
* @param offset the offset to check.
* @return True if "offset" is a boundary position.
*/
-bool_t RuleBasedBreakIterator::isBoundary(int32_t offset) {
+UBool RuleBasedBreakIterator::isBoundary(int32_t offset) {
// the beginning index of the iterator is always a boundary position by definition
if (text == NULL || offset == text->startIndex()) {
return TRUE;
diff --git a/icu4c/source/i18n/rbbi_bld.cpp b/icu4c/source/i18n/rbbi_bld.cpp
index 2937cbc3de9..75d7ba7b9b0 100644
--- a/icu4c/source/i18n/rbbi_bld.cpp
+++ b/icu4c/source/i18n/rbbi_bld.cpp
@@ -307,10 +307,10 @@ RuleBasedBreakIteratorBuilder::buildRuleList(UnicodeString& description,
UChar c = 0x0000;
UChar lastC = 0x0000;
UChar lastOpen = 0x0000;
- bool_t haveEquals = FALSE;
- bool_t haveSlash = FALSE;
- bool_t sawVarName = FALSE;
- bool_t sawIllegalChar = FALSE;
+ UBool haveEquals = FALSE;
+ UBool haveSlash = FALSE;
+ UBool sawVarName = FALSE;
+ UBool sawIllegalChar = FALSE;
int32_t illegalCharPos = 0;
UChar expectedClose = 0x0000;
@@ -886,7 +886,7 @@ RuleBasedBreakIteratorBuilder::buildStateTable(UErrorCode& err)
*/
void
RuleBasedBreakIteratorBuilder::parseRule(const UnicodeString& rule,
- bool_t forward)
+ UBool forward)
{
// algorithm notes:
// - The basic idea here is to read successive character-category groups
@@ -958,7 +958,7 @@ RuleBasedBreakIteratorBuilder::parseRule(const UnicodeString& rule,
UnicodeString temp;
int16_t* state;
- bool_t sawEarlyBreak = FALSE;
+ UBool sawEarlyBreak = FALSE;
// if we're adding rules to the backward state table, mark the initial state
// as a looping state
@@ -1438,7 +1438,7 @@ for (int32_t i = 0; i < newValues.length; i++) System.out.print("\t" + newValues
System.out.println();
*/
- bool_t isLoopingState = loopingStates.contains((void*)rowNum);
+ UBool isLoopingState = loopingStates.contains((void*)rowNum);
// for each of the cells in the rows we're reconciling, do...
for (int32_t i = 0; i < numCategories; i++) {
@@ -1717,7 +1717,7 @@ RuleBasedBreakIteratorBuilder::backfillLoopingStates(void)
* @param forward TRUE if we're working on the forward state table
*/
void
-RuleBasedBreakIteratorBuilder::finishBuildingStateTable(bool_t forward)
+RuleBasedBreakIteratorBuilder::finishBuildingStateTable(UBool forward)
{
//debugPrintTempStateTable();
// start by backfilling the looping states
@@ -1790,7 +1790,7 @@ System.out.println();
// are created.
int32_t currentClass;
int32_t lastClass;
- bool_t split;
+ UBool split;
do {
//System.out.println("Making a pass...");
@@ -1875,8 +1875,8 @@ System.out.println();
// this section does that for the forward state table
if (forward) {
- tables->endStates = new bool_t[newRowNum];
- tables->lookaheadStates = new bool_t[newRowNum];
+ tables->endStates = new UBool[newRowNum];
+ tables->lookaheadStates = new UBool[newRowNum];
tables->stateTable = new int16_t[newRowNum * numCategories];
int32_t p = 0;
int32_t p2 = 0;
diff --git a/icu4c/source/i18n/rbbi_bld.h b/icu4c/source/i18n/rbbi_bld.h
index 1ef54d7156e..59443e7d50b 100644
--- a/icu4c/source/i18n/rbbi_bld.h
+++ b/icu4c/source/i18n/rbbi_bld.h
@@ -123,7 +123,7 @@ protected:
* A flag that is used to indicate when the list of looping states can
* be reset.
*/
- bool_t clearLoopingStates;
+ UBool clearLoopingStates;
/**
* A place where an error message can be stored if we get a parse error.
@@ -252,7 +252,7 @@ private:
* to handle the *? token.
*/
virtual void parseRule(const UnicodeString& rule,
- bool_t forward);
+ UBool forward);
/**
* Update entries in the state table, and merge states when necessary to keep
@@ -331,7 +331,7 @@ private:
* in the iterator itself
* @param forward True if we're working on the forward state table
*/
- virtual void finishBuildingStateTable(bool_t forward);
+ virtual void finishBuildingStateTable(UBool forward);
/**
* This function builds the backward state table from the forward state
diff --git a/icu4c/source/i18n/rbbi_tbl.cpp b/icu4c/source/i18n/rbbi_tbl.cpp
index 293a638eb7f..06f802177cd 100644
--- a/icu4c/source/i18n/rbbi_tbl.cpp
+++ b/icu4c/source/i18n/rbbi_tbl.cpp
@@ -68,7 +68,7 @@ RuleBasedBreakIteratorTables::~RuleBasedBreakIteratorTables() {
* Equality operator. Returns TRUE if both tables objects are of the
* same class, have the same behavior, and iterate over the same text.
*/
-bool_t
+UBool
RuleBasedBreakIteratorTables::operator==(const RuleBasedBreakIteratorTables& that) const {
return this->description == that.description;
}
@@ -115,7 +115,7 @@ RuleBasedBreakIteratorTables::lookupBackwardState(int32_t state, int32_t categor
/**
* Returns true if the specified state is an accepting state.
*/
-bool_t
+UBool
RuleBasedBreakIteratorTables::isEndState(int32_t state) const {
return endStates[state];
}
@@ -123,7 +123,7 @@ RuleBasedBreakIteratorTables::isEndState(int32_t state) const {
/**
* Returns true if the specified state is a lookahead state.
*/
-bool_t
+UBool
RuleBasedBreakIteratorTables::isLookaheadState(int32_t state) const {
return lookaheadStates[state];
}
diff --git a/icu4c/source/i18n/rbbi_tbl.h b/icu4c/source/i18n/rbbi_tbl.h
index a942ac80687..d37eb6aaecc 100644
--- a/icu4c/source/i18n/rbbi_tbl.h
+++ b/icu4c/source/i18n/rbbi_tbl.h
@@ -47,7 +47,7 @@ protected:
* Whether or not we own the storage for the tables (the tables may be
* stored in a memory-mapped file)
*/
- bool_t ownTables;
+ UBool ownTables;
private:
/**
@@ -129,13 +129,13 @@ private:
* Equality operator. Returns TRUE if both tables objects are of the
* same class, have the same behavior, and iterate over the same text.
*/
- virtual bool_t operator==(const RuleBasedBreakIteratorTables& that) const;
+ virtual UBool operator==(const RuleBasedBreakIteratorTables& that) const;
/**
* Not-equal operator. If operator== returns TRUE, this returns FALSE,
* and vice versa.
*/
- bool_t operator!=(const RuleBasedBreakIteratorTables& that) const;
+ UBool operator!=(const RuleBasedBreakIteratorTables& that) const;
/**
* Compute a hash code for these tables
@@ -187,18 +187,18 @@ protected:
/**
* Returns true if the specified state is an accepting state.
*/
- virtual bool_t isEndState(int32_t state) const;
+ virtual UBool isEndState(int32_t state) const;
/**
* Returns true if the specified state is a lookahead state.
*/
- virtual bool_t isLookaheadState(int32_t state) const;
+ virtual UBool isLookaheadState(int32_t state) const;
friend class RuleBasedBreakIterator;
friend class DictionaryBasedBreakIterator;
};
-inline bool_t
+inline UBool
RuleBasedBreakIteratorTables::operator!=(const RuleBasedBreakIteratorTables& that) const {
return !operator==(that);
}
diff --git a/icu4c/source/i18n/rbt.cpp b/icu4c/source/i18n/rbt.cpp
index ccee038c4f7..0c9d8f8b2cc 100644
--- a/icu4c/source/i18n/rbt.cpp
+++ b/icu4c/source/i18n/rbt.cpp
@@ -72,7 +72,7 @@ RuleBasedTransliterator::clone(void) const {
*/
void
RuleBasedTransliterator::handleTransliterate(Replaceable& text, Position& index,
- bool_t isIncremental) const {
+ UBool isIncremental) const {
/* We keep start and limit fixed the entire time,
* relative to the text -- limit may move numerically if text is
* inserted or removed. The cursor moves from start to limit, with
@@ -109,7 +109,7 @@ RuleBasedTransliterator::handleTransliterate(Replaceable& text, Position& index,
loopLimit <<= 4;
}
- bool_t isPartial = FALSE;
+ UBool isPartial = FALSE;
while (cursor < limit && loopCount <= loopLimit) {
TransliterationRule* r = isIncremental ?
diff --git a/icu4c/source/i18n/rbt_data.cpp b/icu4c/source/i18n/rbt_data.cpp
index cb1aff3067c..ca6793cd462 100644
--- a/icu4c/source/i18n/rbt_data.cpp
+++ b/icu4c/source/i18n/rbt_data.cpp
@@ -56,7 +56,7 @@ TransliterationRuleData::lookupSet(UChar standIn) const {
return (i >= 0 && i < setVariablesLength) ? setVariables[i] : 0;
}
-bool_t
+UBool
TransliterationRuleData::isVariableDefined(const UnicodeString& name) const {
return 0 != variableNames->get(name);
}
diff --git a/icu4c/source/i18n/rbt_data.h b/icu4c/source/i18n/rbt_data.h
index 7bad2689e81..84e4dc1c6ed 100644
--- a/icu4c/source/i18n/rbt_data.h
+++ b/icu4c/source/i18n/rbt_data.h
@@ -92,7 +92,7 @@ public:
const UnicodeSet* lookupSet(UChar standIn) const;
- bool_t isVariableDefined(const UnicodeString& name) const;
+ UBool isVariableDefined(const UnicodeString& name) const;
};
#endif
diff --git a/icu4c/source/i18n/rbt_rule.cpp b/icu4c/source/i18n/rbt_rule.cpp
index d1758c8eca0..765737e1491 100644
--- a/icu4c/source/i18n/rbt_rule.cpp
+++ b/icu4c/source/i18n/rbt_rule.cpp
@@ -135,7 +135,7 @@ int16_t TransliterationRule::getIndexValue(const TransliterationRuleData& data)
* value. If the rule contains only ante context, as in foo)>bar,
* then it will match any key.
*/
-bool_t TransliterationRule::matchesIndexValue(uint8_t v,
+UBool TransliterationRule::matchesIndexValue(uint8_t v,
const TransliterationRuleData& data) {
if (anteContextLength == pattern.length()) {
// A pattern with just ante context {such as foo)>bar} can
@@ -153,7 +153,7 @@ bool_t TransliterationRule::matchesIndexValue(uint8_t v,
* r1 then r1 == r2. Examples: "a>x" masks "ab>y". "a>x" masks "a[b]>y".
* "[c]a>x" masks "[dc]a>y".
*/
-bool_t TransliterationRule::masks(const TransliterationRule& r2) const {
+UBool TransliterationRule::masks(const TransliterationRule& r2) const {
/* Rule r1 masks rule r2 if the string formed of the
* antecontext, key, and postcontext overlaps in the following
* way:
@@ -200,7 +200,7 @@ bool_t TransliterationRule::masks(const TransliterationRule& r2) const {
* altered by this transliterator. If filter is
* null then no filtering is applied.
*/
-bool_t TransliterationRule::matches(const Replaceable& text,
+UBool TransliterationRule::matches(const Replaceable& text,
int32_t start, int32_t limit,
int32_t cursor,
const TransliterationRuleData& data,
@@ -311,7 +311,7 @@ int32_t TransliterationRule::getRegionMatchLength(const Replaceable& text,
* altered by this transliterator. If filter is
* null then no filtering is applied.
*/
-bool_t TransliterationRule::charMatches(UChar keyChar, UChar textChar,
+UBool TransliterationRule::charMatches(UChar keyChar, UChar textChar,
const TransliterationRuleData& data,
const UnicodeFilter* filter) const {
const UnicodeSet* set = 0;
diff --git a/icu4c/source/i18n/rbt_rule.h b/icu4c/source/i18n/rbt_rule.h
index 43bd2fea969..7cbda69dd38 100644
--- a/icu4c/source/i18n/rbt_rule.h
+++ b/icu4c/source/i18n/rbt_rule.h
@@ -180,7 +180,7 @@ public:
* value. If the rule contains only ante context, as in foo)>bar,
* then it will match any key.
*/
- bool_t matchesIndexValue(uint8_t v,
+ UBool matchesIndexValue(uint8_t v,
const TransliterationRuleData& data);
/**
@@ -189,7 +189,7 @@ public:
* r1 then r1 == r2. Examples: "a>x" masks "ab>y". "a>x" masks "a[b]>y".
* "[c]a>x" masks "[dc]a>y".
*/
- virtual bool_t masks(const TransliterationRule& r2) const;
+ virtual UBool masks(const TransliterationRule& r2) const;
/**
* Return true if this rule matches the given text.
@@ -206,7 +206,7 @@ public:
* altered by this transliterator. If filter is
* null then no filtering is applied.
*/
- virtual bool_t matches(const Replaceable& text,
+ virtual UBool matches(const Replaceable& text,
int32_t start, int32_t limit,
int32_t cursor,
const TransliterationRuleData& data,
@@ -286,7 +286,7 @@ public:
* altered by this transliterator. If filter is
* null then no filtering is applied.
*/
- virtual bool_t charMatches(UChar keyChar, UChar textChar,
+ virtual UBool charMatches(UChar keyChar, UChar textChar,
const TransliterationRuleData& data,
const UnicodeFilter* filter) const;
};
diff --git a/icu4c/source/i18n/rbt_set.cpp b/icu4c/source/i18n/rbt_set.cpp
index df14d7396ee..70de29712ac 100644
--- a/icu4c/source/i18n/rbt_set.cpp
+++ b/icu4c/source/i18n/rbt_set.cpp
@@ -251,7 +251,7 @@ TransliterationRuleSet::findIncrementalMatch(const Replaceable& text,
int32_t start,
int32_t limit, int32_t cursor,
const TransliterationRuleData& data,
- bool_t& isPartial,
+ UBool& isPartial,
const UnicodeFilter* filter) const {
/* We only need to check our indexed bin of the rule table,
diff --git a/icu4c/source/i18n/rbt_set.h b/icu4c/source/i18n/rbt_set.h
index 4cc2e5eecbe..8812893d878 100644
--- a/icu4c/source/i18n/rbt_set.h
+++ b/icu4c/source/i18n/rbt_set.h
@@ -146,7 +146,7 @@ public:
int32_t start,
int32_t limit, int32_t cursor,
const TransliterationRuleData& data,
- bool_t& isPartial,
+ UBool& isPartial,
const UnicodeFilter* filter) const;
};
#endif
diff --git a/icu4c/source/i18n/simpletz.cpp b/icu4c/source/i18n/simpletz.cpp
index 66586bcce19..bba6f4f5f0c 100644
--- a/icu4c/source/i18n/simpletz.cpp
+++ b/icu4c/source/i18n/simpletz.cpp
@@ -216,7 +216,7 @@ SimpleTimeZone::operator=(const SimpleTimeZone &right)
// -------------------------------------
-bool_t
+UBool
SimpleTimeZone::operator==(const TimeZone& that) const
{
SimpleTimeZone* other = (SimpleTimeZone*)&that;
@@ -317,7 +317,7 @@ SimpleTimeZone::setStartRule(int32_t month, int32_t dayOfMonth,
void
SimpleTimeZone::setStartRule(int32_t month, int32_t dayOfMonth, int32_t dayOfWeek,
- int32_t time, TimeMode mode, bool_t after, UErrorCode& status)
+ int32_t time, TimeMode mode, UBool after, UErrorCode& status)
{
setStartRule(month, after ? dayOfMonth : -dayOfMonth,
-dayOfWeek, time, mode, status);
@@ -368,7 +368,7 @@ SimpleTimeZone::setEndRule(int32_t month, int32_t dayOfMonth,
void
SimpleTimeZone::setEndRule(int32_t month, int32_t dayOfMonth, int32_t dayOfWeek,
- int32_t time, TimeMode mode, bool_t after, UErrorCode& status)
+ int32_t time, TimeMode mode, UBool after, UErrorCode& status)
{
setEndRule(month, after ? dayOfMonth : -dayOfMonth,
-dayOfWeek, time, mode, status);
@@ -460,7 +460,7 @@ SimpleTimeZone::getOffset(uint8_t era, int32_t year, int32_t month, int32_t day,
// Check for southern hemisphere. We assume that the start and end
// month are different.
- bool_t southern = (startMonth > endMonth);
+ UBool southern = (startMonth > endMonth);
// Compare the date to the starting and ending rules.+1 = date>rule, -1
// = datesetTime(date, status);
- bool_t result = gc->inDaylightTime(status);
+ UBool result = gc->inDaylightTime(status);
delete gc;
return result;
}
@@ -679,7 +679,7 @@ bool_t SimpleTimeZone::inDaylightTime(UDate date, UErrorCode& status) const
* @param other the TimeZone object to be compared with
* @return true if the given zone has the same rules and offset as this one
*/
-bool_t
+UBool
SimpleTimeZone::hasSameRules(const TimeZone& other) const
{
if (this == &other) return TRUE;
diff --git a/icu4c/source/i18n/smpdtfmt.cpp b/icu4c/source/i18n/smpdtfmt.cpp
index f93c5f496a7..13f6b2e7346 100644
--- a/icu4c/source/i18n/smpdtfmt.cpp
+++ b/icu4c/source/i18n/smpdtfmt.cpp
@@ -231,7 +231,7 @@ SimpleDateFormat::clone() const
//----------------------------------------------------------------------
-bool_t
+UBool
SimpleDateFormat::operator==(const Format& other) const
{
if (DateFormat::operator==(other) &&
@@ -404,7 +404,7 @@ SimpleDateFormat::format(UDate date, UnicodeString& toAppendTo, FieldPosition& p
// into fields)
fCalendar->setTime(date, status);
- bool_t inQuote = FALSE;
+ UBool inQuote = FALSE;
UChar prevCh = 0;
int32_t count = 0;
UnicodeString str;
@@ -725,14 +725,14 @@ SimpleDateFormat::parse(const UnicodeString& text, ParsePosition& pos) const
{
int32_t start = pos.getIndex();
int32_t oldStart = start;
- bool_t ambiguousYear[] = { FALSE };
+ UBool ambiguousYear[] = { FALSE };
char s[100];
s[text.extract(0, text.length(), s)]=0;
fCalendar->clear();
- bool_t inQuote = FALSE;
+ UBool inQuote = FALSE;
UChar prevCh = 0;
int32_t count = 0;
int32_t interQuoteCount = 1; // Number of chars between quotes
@@ -1046,7 +1046,7 @@ SimpleDateFormat::set2DigitYearStart(UDate d, UErrorCode& status)
*/
// {sfb} removed
/*
-bool_t
+UBool
SimpleDateFormat::subParseLong(const UnicodeString& text, ParsePosition& pos, int32_t& value) const
{
Formattable parseResult;
@@ -1073,7 +1073,7 @@ SimpleDateFormat::subParseLong(const UnicodeString& text, ParsePosition& pos, in
* indicating matching failure, otherwise.
*/
int32_t SimpleDateFormat::subParse(const UnicodeString& text, int32_t& start, UChar ch, int32_t count,
- bool_t obeyCount, bool_t ambiguousYear[]) const
+ UBool obeyCount, UBool ambiguousYear[]) const
{
UErrorCode status = U_ZERO_ERROR;
Formattable number;
@@ -1429,7 +1429,7 @@ void SimpleDateFormat::translatePattern(const UnicodeString& originalPattern,
return;
translatedPattern.remove();
- bool_t inQuote = FALSE;
+ UBool inQuote = FALSE;
for (UTextOffset i = 0; i < originalPattern.length(); ++i) {
UChar c = originalPattern[i];
if (inQuote) {
diff --git a/icu4c/source/i18n/snbkdat.cpp b/icu4c/source/i18n/snbkdat.cpp
index 46647981090..183bea1bc36 100644
--- a/icu4c/source/i18n/snbkdat.cpp
+++ b/icu4c/source/i18n/snbkdat.cpp
@@ -225,7 +225,7 @@ SpecialMapping TextBoundaryData::kSentenceExceptionChar[] = {
SpecialMapping(TextBoundaryData::END_OF_STRING, TextBoundaryData::ksEOS)
};
-const bool_t TextBoundaryData::kSentenceExceptionFlags[] = {
+const UBool TextBoundaryData::kSentenceExceptionFlags[] = {
FALSE, // kNonCharacter = 0,
FALSE, // kUppercaseLetter = 1,
FALSE, // kLowercaseLetter = 2,
diff --git a/icu4c/source/i18n/sortkey.cpp b/icu4c/source/i18n/sortkey.cpp
index 898470177fd..b9f52484920 100644
--- a/icu4c/source/i18n/sortkey.cpp
+++ b/icu4c/source/i18n/sortkey.cpp
@@ -119,7 +119,7 @@ CollationKey::setToBogus()
return *this;
}
-bool_t
+UBool
CollationKey::operator==(const CollationKey& source) const
{
return (this->fCount == source.fCount &&
diff --git a/icu4c/source/i18n/tables.cpp b/icu4c/source/i18n/tables.cpp
index f97df3908b5..9c19f300b3a 100644
--- a/icu4c/source/i18n/tables.cpp
+++ b/icu4c/source/i18n/tables.cpp
@@ -151,13 +151,13 @@ VectorOfInt::operator=(const VectorOfInt& that)
return *this;
}
-bool_t
+UBool
VectorOfInt::isBogus() const
{
return fBogus;
}
-bool_t
+UBool
VectorOfInt::operator==(const VectorOfInt& that)
{
if (this == &that) return TRUE;
@@ -169,7 +169,7 @@ VectorOfInt::operator==(const VectorOfInt& that)
return TRUE;
}
-bool_t
+UBool
VectorOfInt::operator!=(const VectorOfInt& that)
{
return !(*this == that);
@@ -370,14 +370,14 @@ VectorOfPointer::operator=(const VectorOfPointer& that)
return *this;
}
-bool_t
+UBool
VectorOfPointer::isBogus() const
{
return fBogus;
}
-bool_t
+UBool
VectorOfPointer::operator==(const VectorOfPointer& that)
{
if (this == &that) return TRUE;
@@ -389,7 +389,7 @@ VectorOfPointer::operator==(const VectorOfPointer& that)
return TRUE;
}
-bool_t
+UBool
VectorOfPointer::operator!=(const VectorOfPointer& that)
{
return !(*this == that);
@@ -530,7 +530,7 @@ VectorOfPToExpandTable::~VectorOfPToExpandTable()
delete [] fElements;
}
-bool_t
+UBool
VectorOfPToExpandTable::isBogus() const
{
return fBogus;
@@ -754,7 +754,7 @@ VectorOfPToContractElement::~VectorOfPToContractElement()
delete [] fElements;
}
-bool_t
+UBool
VectorOfPToContractElement::isBogus() const
{
return fBogus;
@@ -992,7 +992,7 @@ VectorOfPToContractTable::~VectorOfPToContractTable()
delete [] fElements;
}
-bool_t
+UBool
VectorOfPToContractTable::isBogus() const
{
return fBogus;
@@ -1250,7 +1250,7 @@ VectorOfPointersToPatternEntry::~VectorOfPointersToPatternEntry()
delete [] fElements;
}
-bool_t
+UBool
VectorOfPointersToPatternEntry::isBogus() const
{
return fBogus;
diff --git a/icu4c/source/i18n/tables.h b/icu4c/source/i18n/tables.h
index 953e346cc7a..3a5d2a4c0b7 100644
--- a/icu4c/source/i18n/tables.h
+++ b/icu4c/source/i18n/tables.h
@@ -47,11 +47,11 @@ public:
* Constructor
*/
EntryPair();
- EntryPair(const UnicodeString &name, int32_t aValue, bool_t aFwd = TRUE);
+ EntryPair(const UnicodeString &name, int32_t aValue, UBool aFwd = TRUE);
UnicodeString entryName; // Contracting characters
int32_t value; // Collation order
- bool_t fwd; // true if this pair is for the forward direction
+ UBool fwd; // true if this pair is for the forward direction
/**
* The streamIn and streamOut methods read and write objects of this
@@ -101,8 +101,8 @@ class VectorOfInt {
/**
* Equality operators.
*/
- bool_t operator==(const VectorOfInt& that);
- bool_t operator!=(const VectorOfInt& that);
+ UBool operator==(const VectorOfInt& that);
+ UBool operator!=(const VectorOfInt& that);
/**
* Gets a read-only reference to the element at the specified index.
@@ -157,7 +157,7 @@ class VectorOfInt {
* Checks if this vector object is valid.
* @return TRUE if the vector object is valid, FALSE otherwise.
*/
- bool_t isBogus(void) const;
+ UBool isBogus(void) const;
/**
* The streamIn and streamOut methods read and write objects of this
@@ -179,7 +179,7 @@ class VectorOfInt {
int32_t fSize;
int32_t fCapacity;
int32_t* fElements;
- bool_t fBogus;
+ UBool fBogus;
};
/**
@@ -227,8 +227,8 @@ class VectorOfPointer {
/**
* Equality operators.
*/
- bool_t operator==(const VectorOfPointer& that);
- bool_t operator!=(const VectorOfPointer& that);
+ UBool operator==(const VectorOfPointer& that);
+ UBool operator!=(const VectorOfPointer& that);
/**
* Gets a read-only reference to the element at the specified index.
@@ -272,7 +272,7 @@ class VectorOfPointer {
* Checks if this vector object is valid.
* @return TRUE if the vector object is valid, FALSE otherwise.
*/
- bool_t isBogus(void) const;
+ UBool isBogus(void) const;
private:
/**
@@ -284,7 +284,7 @@ class VectorOfPointer {
int32_t fSize;
int32_t fCapacity;
void** fElements;
- bool_t fBogus;
+ UBool fBogus;
};
//=================================================================================================
@@ -463,7 +463,7 @@ class VectorOfPToExpandTable {
* Checks if this vector object is valid.
* @return TRUE if the vector object is valid, FALSE otherwise.
*/
- bool_t isBogus(void) const;
+ UBool isBogus(void) const;
/**
* The streamIn and streamOut methods read and write objects of this
@@ -485,7 +485,7 @@ class VectorOfPToExpandTable {
int32_t fSize;
int32_t fCapacity;
VectorOfInt** fElements;
- bool_t fBogus;
+ UBool fBogus;
};
class VectorOfPToContractElement;
@@ -639,7 +639,7 @@ class VectorOfPToContractElement {
* Checks if this vector object is valid.
* @return TRUE if the vector object is valid, FALSE otherwise.
*/
- bool_t isBogus(void) const;
+ UBool isBogus(void) const;
/**
* The streamIn and streamOut methods read and write objects of this
@@ -661,7 +661,7 @@ class VectorOfPToContractElement {
int32_t fSize;
int32_t fCapacity;
EntryPair** fElements;
- bool_t fBogus;
+ UBool fBogus;
};
class VectorOfPToContractTable;
@@ -799,7 +799,7 @@ class VectorOfPToContractTable {
* Checks if this vector object is valid.
* @return TRUE if the vector object is valid, FALSE otherwise.
*/
- bool_t isBogus(void) const;
+ UBool isBogus(void) const;
/**
* The streamIn and streamOut methods read and write objects of this
* class as binary, platform-dependent data in the iostream. The stream
@@ -820,7 +820,7 @@ class VectorOfPToContractTable {
int32_t fSize;
int32_t fCapacity;
VectorOfPToContractElement** fElements;
- bool_t fBogus;
+ UBool fBogus;
};
class PatternEntry;
@@ -991,7 +991,7 @@ class VectorOfPointersToPatternEntry {
* Checks if this vector object is valid.
* @return TRUE if the vector object is valid, FALSE otherwise.
*/
- bool_t isBogus(void) const;
+ UBool isBogus(void) const;
private:
/**
* Resizes the vector if necessary when compared to a new size.
@@ -1002,7 +1002,7 @@ class VectorOfPointersToPatternEntry {
int32_t fSize;
int32_t fCapacity;
PatternEntry** fElements;
- bool_t fBogus;
+ UBool fBogus;
};
inline
@@ -1012,7 +1012,7 @@ EntryPair::EntryPair()
}
inline
-EntryPair::EntryPair(const UnicodeString &name, int32_t aValue, bool_t aFwd)
+EntryPair::EntryPair(const UnicodeString &name, int32_t aValue, UBool aFwd)
: entryName(name), value(aValue), fwd(aFwd)
{
}
diff --git a/icu4c/source/i18n/tblcoll.cpp b/icu4c/source/i18n/tblcoll.cpp
index edd0125f9e6..96dd60cd31e 100644
--- a/icu4c/source/i18n/tblcoll.cpp
+++ b/icu4c/source/i18n/tblcoll.cpp
@@ -515,7 +515,7 @@ RuleBasedCollator::RuleBasedCollator(const RuleBasedCollator& that)
{
}
-bool_t
+UBool
RuleBasedCollator::operator==(const Collator& that) const
{
if (this == &that)
@@ -824,7 +824,7 @@ RuleBasedCollator::RuleBasedCollator( const Locale& desiredLocale,
UnicodeString defLocaleName = UnicodeString(ResourceBundle::kDefaultFilename,"");
char *binaryFilePath = createPathName(UnicodeString(u_getDataDirectory(),""),
defLocaleName, UnicodeString(kFilenameSuffix,""));
- bool_t ok = writeToFile(binaryFilePath);
+ UBool ok = writeToFile(binaryFilePath);
delete [] binaryFilePath;
#ifdef COLLDEBUG
cerr << defLocaleName << " [default] binary write " << (ok? "OK" : "Failed") << endl;
@@ -919,7 +919,7 @@ RuleBasedCollator::RuleBasedCollator( const Locale& desiredLocale,
void
RuleBasedCollator::constructFromFile( const Locale& locale,
const UnicodeString& localeFileName,
- bool_t tryBinaryFile,
+ UBool tryBinaryFile,
UErrorCode& status)
{
// constructFromFile creates a collation object by reading from a
@@ -1046,7 +1046,7 @@ RuleBasedCollator::constructFromFile( const Locale& locale,
// binary file to the disk. The next time the system wants to
// get this collation, it will load up very quickly from the
// binary file.
- bool_t ok = writeToFile(binaryFilePath);
+ UBool ok = writeToFile(binaryFilePath);
delete [] binaryFilePath;
#ifdef COLLDEBUG
cerr << localeFileName << " binary write " << (ok? "OK" : "Failed") << endl;
@@ -1256,11 +1256,11 @@ RuleBasedCollator::compare(const UChar* source,
int32_t sOrder, tOrder;
// int32_t sOrder = CollationElementIterator::NULLORDER, tOrder = CollationElementIterator::NULLORDER;
- bool_t gets = TRUE, gett = TRUE;
- bool_t initialCheckSecTer = getStrength() >= Collator::SECONDARY;
- bool_t checkSecTer = initialCheckSecTer;
- bool_t checkTertiary = getStrength() >= Collator::TERTIARY;
- bool_t isFrenchSec = data->isFrenchSec;
+ UBool gets = TRUE, gett = TRUE;
+ UBool initialCheckSecTer = getStrength() >= Collator::SECONDARY;
+ UBool checkSecTer = initialCheckSecTer;
+ UBool checkTertiary = getStrength() >= Collator::TERTIARY;
+ UBool isFrenchSec = data->isFrenchSec;
uint32_t pSOrder, pTOrder;
while(TRUE)
@@ -1652,9 +1652,9 @@ RuleBasedCollator::getCollationKey( const UChar* source,
return sortkey.setToBogus();
}
- bool_t compareSec = (getStrength() >= Collator::SECONDARY);
- bool_t compareTer = (getStrength() >= Collator::TERTIARY);
- bool_t compareIdent = (getStrength() == Collator::IDENTICAL);
+ UBool compareSec = (getStrength() >= Collator::SECONDARY);
+ UBool compareTer = (getStrength() >= Collator::TERTIARY);
+ UBool compareIdent = (getStrength() == Collator::IDENTICAL);
int32_t order = 0;
int32_t totalPrimary = 0;
int32_t totalSec = 0;
@@ -1857,7 +1857,7 @@ RuleBasedCollator::build(const UnicodeString& pattern,
}
Collator::ECollationStrength aStrength = Collator::IDENTICAL;
- bool_t isSource = TRUE;
+ UBool isSource = TRUE;
int32_t i = 0;
UnicodeString lastGroupChars;
UnicodeString expChars;
@@ -2003,7 +2003,7 @@ RuleBasedCollator::build(const UnicodeString& pattern,
// for each individual character, we can add an expanding
// table entry for the pre-composed character
//
- bool_t allThere = TRUE;
+ UBool allThere = TRUE;
int32_t i;
for (i = 0; i < decomp.length(); i += 1)
@@ -2230,7 +2230,7 @@ int32_t RuleBasedCollator::addExpansion(int32_t anOrder, const UnicodeString &ex
void
RuleBasedCollator::addContractOrder(const UnicodeString& groupChars,
int32_t anOrder,
- bool_t fwd,
+ UBool fwd,
UErrorCode& status)
{
if (U_FAILURE(status))
@@ -2426,7 +2426,7 @@ RuleBasedCollator::hashCode() const
int32_t
RuleBasedCollator::getEntry(VectorOfPToContractElement* list,
const UnicodeString& name,
- bool_t fwd)
+ UBool fwd)
{
int32_t i;
@@ -2598,7 +2598,7 @@ void RuleBasedCollatorStreamer::streamOut(const RuleBasedCollator* collator, Fil
}
}
-bool_t RuleBasedCollator::writeToFile(const char* fileName) const
+UBool RuleBasedCollator::writeToFile(const char* fileName) const
{
FileStream* ofs = T_FileStream_open(fileName, "wb");
if (ofs != 0)
@@ -2611,7 +2611,7 @@ bool_t RuleBasedCollator::writeToFile(const char* fileName) const
(!T_FileStream_error(ofs) ? ", OK" : ", FAIL"));
#endif
- bool_t err = T_FileStream_error(ofs) == 0;
+ UBool err = T_FileStream_error(ofs) == 0;
T_FileStream_close(ofs);
return err;
diff --git a/icu4c/source/i18n/tcoldata.cpp b/icu4c/source/i18n/tcoldata.cpp
index 8611711e56e..e8c2be03da8 100644
--- a/icu4c/source/i18n/tcoldata.cpp
+++ b/icu4c/source/i18n/tcoldata.cpp
@@ -52,7 +52,7 @@ TableCollationData::~TableCollationData()
delete expandTable;
}
-bool_t
+UBool
TableCollationData::isBogus() const
{
return fBogus;
diff --git a/icu4c/source/i18n/tcoldata.h b/icu4c/source/i18n/tcoldata.h
index cdd8d250b65..5d3560bb2df 100644
--- a/icu4c/source/i18n/tcoldata.h
+++ b/icu4c/source/i18n/tcoldata.h
@@ -96,7 +96,7 @@ public:
* Checks if this object is valid.
* @return TRUE if the object is valid, FALSE otherwise.
*/
- bool_t isBogus() const;
+ UBool isBogus() const;
private:
/**
* The following are disallowed operations: not implemented.
@@ -119,13 +119,13 @@ private:
friend class RuleBasedCollator;
friend class CollationElementIterator;
- bool_t isFrenchSec;
+ UBool isFrenchSec;
int16_t maxSecOrder;
int16_t maxTerOrder;
CompactIntArray* mapping;
VectorOfPToContractTable* contractTable;
VectorOfPToExpandTable* expandTable;
- bool_t fBogus;
+ UBool fBogus;
/**
* Rule string data is generated dynamically when required by the TableCollation
@@ -145,7 +145,7 @@ private:
* See RuleBasedCollator::getRules().
*/
UnicodeString ruleTable;
- bool_t isRuleTableLoaded;
+ UBool isRuleTableLoaded;
Locale desiredLocale;
UnicodeString realLocaleName;
};
diff --git a/icu4c/source/i18n/timezone.cpp b/icu4c/source/i18n/timezone.cpp
index 8279b2892ae..229d1df082e 100644
--- a/icu4c/source/i18n/timezone.cpp
+++ b/icu4c/source/i18n/timezone.cpp
@@ -63,7 +63,7 @@ const TZHeader * TimeZone::DATA = 0;
const uint32_t* TimeZone::INDEX_BY_ID = 0;
const OffsetIndex* TimeZone::INDEX_BY_OFFSET = 0;
UnicodeString* TimeZone::ZONE_IDS = 0;
-bool_t TimeZone::DATA_LOADED = FALSE;
+UBool TimeZone::DATA_LOADED = FALSE;
UMTX TimeZone::LOCK;
/**
@@ -130,7 +130,7 @@ void TimeZone::loadZoneData() {
/**
* udata callback to verify the zone data.
*/
-bool_t U_CALLCONV
+UBool U_CALLCONV
TimeZone::isDataAcceptable(void *context,
const char *type, const char *name,
const UDataInfo *pInfo) {
@@ -177,7 +177,7 @@ TimeZone::operator=(const TimeZone &right)
// -------------------------------------
-bool_t
+UBool
TimeZone::operator==(const TimeZone& that) const
{
return getDynamicClassID() == that.getDynamicClassID() &&
@@ -489,13 +489,13 @@ TimeZone::getDisplayName(const Locale& locale, UnicodeString& result) const
}
UnicodeString&
-TimeZone::getDisplayName(bool_t daylight, EDisplayType style, UnicodeString& result) const
+TimeZone::getDisplayName(UBool daylight, EDisplayType style, UnicodeString& result) const
{
return getDisplayName(daylight,style, Locale::getDefault(), result);
}
UnicodeString&
-TimeZone::getDisplayName(bool_t daylight, EDisplayType style, const Locale& locale, UnicodeString& result) const
+TimeZone::getDisplayName(UBool daylight, EDisplayType style, const Locale& locale, UnicodeString& result) const
{
// SRL TODO: cache the SDF, just like java.
UErrorCode status = U_ZERO_ERROR;
@@ -553,7 +553,7 @@ TimeZone::createCustomTimeZone(const UnicodeString& id)
idUppercase.startsWith(GMT_ID))
{
ParsePosition pos(GMT_ID_LENGTH);
- bool_t negative = FALSE;
+ UBool negative = FALSE;
int32_t offset;
if (id[pos.getIndex()] == 0x002D /*'-'*/)
@@ -612,7 +612,7 @@ TimeZone::createCustomTimeZone(const UnicodeString& id)
}
-bool_t
+UBool
TimeZone::hasSameRules(const TimeZone& other) const
{
return (getRawOffset() == other.getRawOffset() &&
diff --git a/icu4c/source/i18n/translit.cpp b/icu4c/source/i18n/translit.cpp
index 965be44025b..45705a87ecd 100644
--- a/icu4c/source/i18n/translit.cpp
+++ b/icu4c/source/i18n/translit.cpp
@@ -64,7 +64,7 @@ UMTX Transliterator::cacheMutex = NULL;
* the code as part of a shared library, and (2) to avoid static
* intialization problems.
*/
-bool_t Transliterator::cacheInitialized = FALSE;
+UBool Transliterator::cacheInitialized = FALSE;
/**
* Prefix for resource bundle key for the display name for a
@@ -644,7 +644,7 @@ Transliterator* Transliterator::_createInstance(const UnicodeString& ID,
} else {
// At this point entry type must be either RULE_BASED_PLACEHOLDER
// or REVERSE_RULE_BASED_PLACEHOLDER.
- bool_t isReverse =
+ UBool isReverse =
(entry->entryType ==
CacheEntry::REVERSE_RULE_BASED_PLACEHOLDER);
@@ -854,7 +854,7 @@ UChar Transliterator::filteredCharAt(const Replaceable& text, int32_t i) const {
* Comparison function for UVector. Compares two UnicodeString
* objects given void* pointers to them.
*/
-bool_t Transliterator::compareIDs(void* a, void* b) {
+UBool Transliterator::compareIDs(void* a, void* b) {
const UnicodeString* aa = (const UnicodeString*) a;
const UnicodeString* bb = (const UnicodeString*) b;
return *aa == *bb;
diff --git a/icu4c/source/i18n/txtbdat.h b/icu4c/source/i18n/txtbdat.h
index e485834766a..39913c3fca1 100644
--- a/icu4c/source/i18n/txtbdat.h
+++ b/icu4c/source/i18n/txtbdat.h
@@ -198,7 +198,7 @@ private:
static const int32_t kCharacterRawMapping_length;
static SpecialMapping kCharacterExceptionChar[];
static const int32_t kCharacterExceptionChar_length;
- static const bool_t kCharacterExceptionFlags[];
+ static const UBool kCharacterExceptionFlags[];
static UnicodeClassMapping* kCharacterMap;
static Type kCharacterAsciiValues[];
@@ -242,7 +242,7 @@ private:
static const int32_t kWordExceptionChar_length;
static UnicodeClassMapping* kWordMap;
static Type kWordAsciiValues[];
- static const bool_t kWordExceptionFlags[];
+ static const UBool kWordExceptionFlags[];
private:
// Sentence data
@@ -281,7 +281,7 @@ private:
static const int32_t kSentenceExceptionChar_length;
static UnicodeClassMapping* kSentenceMap;
static Type kSentenceAsciiValues[];
- static const bool_t kSentenceExceptionFlags[];
+ static const UBool kSentenceExceptionFlags[];
private:
// Line data
@@ -330,7 +330,7 @@ private:
static const int32_t kLineRawMapping_length;
static SpecialMapping kLineExceptionChar[];
static const int32_t kLineExceptionChar_length;
- static const bool_t kLineExceptionFlags[];
+ static const UBool kLineExceptionFlags[];
static UnicodeClassMapping* kLineMap;
static Type kLineAsciiValues[];
diff --git a/icu4c/source/i18n/ucal.cpp b/icu4c/source/i18n/ucal.cpp
index e100d2c30c9..ef9b022a37a 100644
--- a/icu4c/source/i18n/ucal.cpp
+++ b/icu4c/source/i18n/ucal.cpp
@@ -158,11 +158,11 @@ ucal_getTimeZoneDisplayName( const UCalendar* cal,
return actLen;
}
-U_CAPI bool_t
+U_CAPI UBool
ucal_inDaylightTime( const UCalendar* cal,
UErrorCode* status )
{
- if(U_FAILURE(*status)) return (bool_t) -1;
+ if(U_FAILURE(*status)) return (UBool) -1;
return ((Calendar*)cal)->inDaylightTime(*status);
}
@@ -193,7 +193,7 @@ ucal_setAttribute( UCalendar* cal,
{
switch(attr) {
case UCAL_LENIENT:
- ((Calendar*)cal)->setLenient((bool_t)newValue);
+ ((Calendar*)cal)->setLenient((UBool)newValue);
break;
case UCAL_FIRST_DAY_OF_WEEK:
@@ -266,7 +266,7 @@ ucal_setDateTime( UCalendar* cal,
((Calendar*)cal)->set(year, month, date, hour, minute, second);
}
-U_CAPI bool_t
+U_CAPI UBool
ucal_equivalentTo( const UCalendar* cal1,
const UCalendar* cal2)
{
@@ -313,7 +313,7 @@ ucal_set( UCalendar* cal,
((Calendar*)cal)->set((Calendar::EDateFields)field, value);
}
-U_CAPI bool_t
+U_CAPI UBool
ucal_isSet( const UCalendar* cal,
UCalendarDateFields field)
{
diff --git a/icu4c/source/i18n/ucol.cpp b/icu4c/source/i18n/ucol.cpp
index 99ba63c912a..73cf9d43d1f 100644
--- a/icu4c/source/i18n/ucol.cpp
+++ b/icu4c/source/i18n/ucol.cpp
@@ -136,7 +136,7 @@ ucol_strcoll( const UCollator *coll,
return (UCollationResult) ((Collator*)coll)->compare(source,sourceLength,target,targetLength);
}
-U_CAPI bool_t
+U_CAPI UBool
ucol_greater( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@@ -147,7 +147,7 @@ ucol_greater( const UCollator *coll,
== UCOL_GREATER);
}
-U_CAPI bool_t
+U_CAPI UBool
ucol_greaterOrEqual( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@@ -158,7 +158,7 @@ ucol_greaterOrEqual( const UCollator *coll,
!= UCOL_LESS);
}
-U_CAPI bool_t
+U_CAPI UBool
ucol_equal( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
diff --git a/icu4c/source/i18n/udat.cpp b/icu4c/source/i18n/udat.cpp
index cbd5062c065..51451ad9224 100644
--- a/icu4c/source/i18n/udat.cpp
+++ b/icu4c/source/i18n/udat.cpp
@@ -169,7 +169,7 @@ udat_parse( const UDateFormat* format,
return res;
}
-U_CAPI bool_t
+U_CAPI UBool
udat_isLenient(const UDateFormat* fmt)
{
return ((DateFormat*)fmt)->isLenient();
@@ -177,7 +177,7 @@ udat_isLenient(const UDateFormat* fmt)
U_CAPI void
udat_setLenient( UDateFormat* fmt,
- bool_t isLenient)
+ UBool isLenient)
{
((DateFormat*)fmt)->setLenient(isLenient);
}
@@ -239,7 +239,7 @@ udat_set2DigitYearStart( UDateFormat *fmt,
U_CAPI int32_t
udat_toPattern( const UDateFormat *fmt,
- bool_t localized,
+ UBool localized,
UChar *result,
int32_t resultLength,
UErrorCode *status)
@@ -262,7 +262,7 @@ udat_toPattern( const UDateFormat *fmt,
// TBD: should this take an UErrorCode?
U_CAPI void
udat_applyPattern( UDateFormat *format,
- bool_t localized,
+ UBool localized,
const UChar *pattern,
int32_t patternLength)
{
diff --git a/icu4c/source/i18n/umsg.cpp b/icu4c/source/i18n/umsg.cpp
index dba2a994f79..cf93c229c02 100644
--- a/icu4c/source/i18n/umsg.cpp
+++ b/icu4c/source/i18n/umsg.cpp
@@ -89,7 +89,7 @@ matchType(const UChar *pat,
kw = findKeyword(type, fgTypeList, matchLen);
// there is a modifier if type contains a ','
- bool_t hasModifier = (type.indexOf((UChar)0x002C) != -1);
+ UBool hasModifier = (type.indexOf((UChar)0x002C) != -1);
switch(kw) {
@@ -282,7 +282,7 @@ u_vformatMessage( const char *locale,
// All it does is look for an unquoted '{' and read the type
int32_t part = 0;
- bool_t inQuote = FALSE;
+ UBool inQuote = FALSE;
int32_t braceStack = 0;
const UChar *pat = pattern;
const UChar *patLimit = pattern + patLen;
diff --git a/icu4c/source/i18n/unicdcm.cpp b/icu4c/source/i18n/unicdcm.cpp
index ea722c58174..15c3fd45a2f 100644
--- a/icu4c/source/i18n/unicdcm.cpp
+++ b/icu4c/source/i18n/unicdcm.cpp
@@ -39,7 +39,7 @@ UnicodeClassMapping::UnicodeClassMapping(Type* mappedValue,
int32_t mappedValue_length,
const SpecialMapping* exceptionChars,
int32_t exceptionChars_length,
- const bool_t *hasException,
+ const UBool *hasException,
Type* asciiValues)
: fMappedValue(mappedValue),
fMappedValue_length(mappedValue_length),
diff --git a/icu4c/source/i18n/unicdcm.h b/icu4c/source/i18n/unicdcm.h
index f6e7dff288a..25dfad80ec3 100644
--- a/icu4c/source/i18n/unicdcm.h
+++ b/icu4c/source/i18n/unicdcm.h
@@ -49,7 +49,7 @@ public:
int32_t mappedValue_length,
const SpecialMapping* exceptionChars,
int32_t exceptionChars_length,
- const bool_t* hasException,
+ const UBool* hasException,
Type* asiiValues );
/**
@@ -60,7 +60,7 @@ public:
Type mappedChar(UChar ch) const;
private:
- const bool_t *fHasException;
+ const UBool *fHasException;
const Type* fMappedValue;
const int32_t fMappedValue_length;
const SpecialMapping* fExceptionChars;
diff --git a/icu4c/source/i18n/unicode/brkiter.h b/icu4c/source/i18n/unicode/brkiter.h
index 2ce140d26ef..94ca12617c4 100644
--- a/icu4c/source/i18n/unicode/brkiter.h
+++ b/icu4c/source/i18n/unicode/brkiter.h
@@ -180,13 +180,13 @@ public:
* object, and styles are not considered.
* @stable
*/
- virtual bool_t operator==(const BreakIterator&) const = 0;
+ virtual UBool operator==(const BreakIterator&) const = 0;
/**
* Returns the complement of the result of operator==
* @stable
*/
- bool_t operator!=(const BreakIterator& rhs) const { return !operator==(rhs); }
+ UBool operator!=(const BreakIterator& rhs) const { return !operator==(rhs); }
/**
* Return a polymorphic copy of this object. This is an abstract
@@ -297,7 +297,7 @@ public:
* @return True if "offset" is a boundary position.
* @stable
*/
- virtual bool_t isBoundary(UTextOffset offset) = 0;
+ virtual UBool isBoundary(UTextOffset offset) = 0;
/**
* Return the nth boundary from the current boundary
diff --git a/icu4c/source/i18n/unicode/calendar.h b/icu4c/source/i18n/unicode/calendar.h
index dc736e7382c..6870dba4cba 100644
--- a/icu4c/source/i18n/unicode/calendar.h
+++ b/icu4c/source/i18n/unicode/calendar.h
@@ -361,7 +361,7 @@ public:
* otherwise.
* @stable
*/
- virtual bool_t operator==(const Calendar& that) const;
+ virtual UBool operator==(const Calendar& that) const;
/**
* Compares the inequality of two Calendar objects.
@@ -371,7 +371,7 @@ public:
* otherwise.
* @stable
*/
- bool_t operator!=(const Calendar& that) const {return !operator==(that);}
+ UBool operator!=(const Calendar& that) const {return !operator==(that);}
/**
* Compares the Calendar time, whereas Calendar::operator== compares the equality of
@@ -387,7 +387,7 @@ public:
* Calendar when; false otherwise.
* @stable
*/
- bool_t equals(const Calendar& when, UErrorCode& status) const;
+ UBool equals(const Calendar& when, UErrorCode& status) const;
/**
* Returns true if this Calendar's current time is before "when"'s current time.
@@ -402,7 +402,7 @@ public:
* Calendar when; false otherwise.
* @stable
*/
- bool_t before(const Calendar& when, UErrorCode& status) const;
+ UBool before(const Calendar& when, UErrorCode& status) const;
/**
* Returns true if this Calendar's current time is after "when"'s current time.
@@ -417,14 +417,14 @@ public:
* Calendar when; false otherwise.
* @stable
*/
- bool_t after(const Calendar& when, UErrorCode& status) const;
+ UBool after(const Calendar& when, UErrorCode& status) const;
/**
* Return true if another Calendar object is equivalent to this one. An equivalent
* Calendar will behave exactly as this one does, but may be set to a different time.
* @deprecated not in Java API!
*/
- virtual bool_t equivalentTo(const Calendar& other) const;
+ virtual UBool equivalentTo(const Calendar& other) const;
/**
* UDate Arithmetic function. Adds the specified (signed) amount of time to the given
@@ -468,7 +468,7 @@ public:
* leniency, this will be set to an error status.
* @stable
*/
- void roll(EDateFields field, bool_t up, UErrorCode& status);
+ void roll(EDateFields field, UBool up, UErrorCode& status);
/**
* Time Field Rolling function. Rolls by the given amount on the given
@@ -541,7 +541,7 @@ public:
* false, otherwise.
* @stable
*/
- virtual bool_t inDaylightTime(UErrorCode& status) const = 0;
+ virtual UBool inDaylightTime(UErrorCode& status) const = 0;
/**
* Specifies whether or not date/time interpretation is to be lenient. With lenient
@@ -555,7 +555,7 @@ public:
* @see DateFormat#setLenient
* @stable
*/
- void setLenient(bool_t lenient);
+ void setLenient(UBool lenient);
/**
* Tells whether date/time interpretation is to be lenient.
@@ -563,7 +563,7 @@ public:
* @return True tells that date/time interpretation is to be lenient.
* @stable
*/
- bool_t isLenient(void) const;
+ UBool isLenient(void) const;
/**
* Sets what the first day of the week is; e.g., Sunday in US, Monday in France.
@@ -697,7 +697,7 @@ public:
* @return True if the given time field has a value set; false otherwise.
* @stable
*/
- bool_t isSet(EDateFields field) const;
+ UBool isSet(EDateFields field) const;
/**
* Sets the given time field with the given value.
@@ -897,7 +897,7 @@ protected:
/**
* The flag which indicates if the current time is set in the calendar.
*/
- bool_t fIsTimeSet;
+ UBool fIsTimeSet;
/**
* True if the fields are in sync with the currently set time of this Calendar.
@@ -908,13 +908,13 @@ protected:
* This should really be named areFieldsInSync, but the old name is retained
* for backward compatibility.
*/
- bool_t fAreFieldsSet;
+ UBool fAreFieldsSet;
/**
* True if all of the fields have been set. This is initially false, and set to
* true by computeFields().
*/
- bool_t fAreAllFieldsSet;
+ UBool fAreAllFieldsSet;
/**
* Get the current time without recomputing.
@@ -936,7 +936,7 @@ protected:
/**
* The flags which tell if a specified time field for the calendar is set.
*/
- bool_t fIsSet[FIELD_COUNT];
+ UBool fIsSet[FIELD_COUNT];
// Special values of stamp[]
enum {
@@ -965,7 +965,7 @@ private:
/**
* @see #setLenient
*/
- bool_t fLenient;
+ UBool fLenient;
/**
* Time zone affects the time calculation done by Calendar. Calendar subclasses use
@@ -1028,7 +1028,7 @@ Calendar::createInstance(TimeZone* zone, UErrorCode& errorCode)
// -------------------------------------
inline void
-Calendar::roll(EDateFields field, bool_t up, UErrorCode& status)
+Calendar::roll(EDateFields field, UBool up, UErrorCode& status)
{
roll(field, (int32_t)(up ? +1 : -1), status);
}
diff --git a/icu4c/source/i18n/unicode/choicfmt.h b/icu4c/source/i18n/unicode/choicfmt.h
index 52be9276cba..757a58c5d0b 100644
--- a/icu4c/source/i18n/unicode/choicfmt.h
+++ b/icu4c/source/i18n/unicode/choicfmt.h
@@ -177,7 +177,7 @@ public:
* Objects of different subclasses are considered unequal.
* @stable
*/
- virtual bool_t operator==(const Format& other) const;
+ virtual UBool operator==(const Format& other) const;
/**
* Sets the pattern.
@@ -369,7 +369,7 @@ public:
* Does not affect floating-point flags,
* @stable
*/
- static double nextDouble(double d, bool_t positive);
+ static double nextDouble(double d, UBool positive);
/**
* Finds the least double greater than d.
diff --git a/icu4c/source/i18n/unicode/coleitr.h b/icu4c/source/i18n/unicode/coleitr.h
index 563f36c3892..500f9637102 100644
--- a/icu4c/source/i18n/unicode/coleitr.h
+++ b/icu4c/source/i18n/unicode/coleitr.h
@@ -99,13 +99,13 @@ public:
* Returns true if "other" is the same as "this"
* @stable
*/
- bool_t operator==(const CollationElementIterator& other) const;
+ UBool operator==(const CollationElementIterator& other) const;
/**
* Returns true if "other" is not the same as "this".
* @stable
*/
- bool_t operator!=(const CollationElementIterator& other) const;
+ UBool operator!=(const CollationElementIterator& other) const;
/**
* Resets the cursor to the beginning of the string.
@@ -190,7 +190,7 @@ public:
* @return TRUE if a character is ignorable, FALSE otherwise.
* @stable
*/
- static bool_t isIgnorable(int32_t order);
+ static UBool isIgnorable(int32_t order);
/**
* Gets the offset of the currently processed character in the source string.
* @return the offset of the character.
@@ -288,14 +288,14 @@ private:
int32_t prevContractChar( UChar ch,
UErrorCode& status);
- inline static bool_t isThaiPreVowel(UChar ch);
+ inline static UBool isThaiPreVowel(UChar ch);
- inline static bool_t isThaiBaseConsonant(UChar ch);
+ inline static UBool isThaiBaseConsonant(UChar ch);
VectorOfInt* makeReorderedBuffer(UChar colFirst,
int32_t lastValue,
VectorOfInt* lastExpansion,
- bool_t forward, UErrorCode& status);
+ UBool forward, UErrorCode& status);
friend class RuleBasedCollator;
static const int32_t UNMAPPEDCHARVALUE;
@@ -368,7 +368,7 @@ CollationElementIterator::getMaxExpansion(int32_t order) const
return orderAlias->getMaxExpansion(order);
}
-inline bool_t
+inline UBool
CollationElementIterator::isIgnorable(int32_t order)
{
return (primaryOrder(order) == 0);
@@ -378,14 +378,14 @@ CollationElementIterator::isIgnorable(int32_t order)
* Determine if a character is a Thai vowel (which sorts after
* its base consonant).
*/
-inline bool_t CollationElementIterator::isThaiPreVowel(UChar ch) {
+inline UBool CollationElementIterator::isThaiPreVowel(UChar ch) {
return (ch >= (UChar)0x0E40) && (ch <= (UChar)0X0E44);
}
/**
* Determine if a character is a Thai base consonant
*/
-inline bool_t CollationElementIterator::isThaiBaseConsonant(UChar ch) {
+inline UBool CollationElementIterator::isThaiBaseConsonant(UChar ch) {
return (ch >= (UChar)0x0E01) && (ch <= (UChar)0x0E2E);
}
diff --git a/icu4c/source/i18n/unicode/coll.h b/icu4c/source/i18n/unicode/coll.h
index 33a3717dfa6..6e0e0fb5f1d 100644
--- a/icu4c/source/i18n/unicode/coll.h
+++ b/icu4c/source/i18n/unicode/coll.h
@@ -196,13 +196,13 @@ public:
* Returns true if "other" is the same as "this"
* @stable
*/
- virtual bool_t operator==(const Collator& other) const;
+ virtual UBool operator==(const Collator& other) const;
/**
* Returns true if "other" is not the same as "this".
* @stable
*/
- virtual bool_t operator!=(const Collator& other) const;
+ virtual UBool operator!=(const Collator& other) const;
/**
* Makes a shallow copy of the current object.
@@ -422,7 +422,7 @@ public:
* @see Collator#compare
* @stable
*/
- bool_t greater( const UnicodeString& source,
+ UBool greater( const UnicodeString& source,
const UnicodeString& target) const;
/**
* Convenience method for comparing two strings based on the collation
@@ -434,7 +434,7 @@ public:
* @see Collator#compare
* @stable
*/
- bool_t greaterOrEqual( const UnicodeString& source,
+ UBool greaterOrEqual( const UnicodeString& source,
const UnicodeString& target) const;
/**
* Convenience method for comparing two strings based on the collation
@@ -446,7 +446,7 @@ public:
* @see Collator#compare
* @stable
*/
- bool_t equals( const UnicodeString& source,
+ UBool equals( const UnicodeString& source,
const UnicodeString& target) const;
// getter/setter
@@ -573,19 +573,19 @@ private:
static const UVersionInfo fVersion;
};
-inline bool_t
+inline UBool
Collator::operator==(const Collator& other) const
{
- bool_t result;
+ UBool result;
if (this == &other) result = TRUE;
else result = ((strength == other.strength) && (decmp == other.decmp));
return result;
}
-inline bool_t
+inline UBool
Collator::operator!=(const Collator& other) const
{
- bool_t result;
+ UBool result;
result = !(*this == other);
return result;
}
diff --git a/icu4c/source/i18n/unicode/cpdtrans.h b/icu4c/source/i18n/unicode/cpdtrans.h
index 71a3eca57c0..6ba22ffafae 100644
--- a/icu4c/source/i18n/unicode/cpdtrans.h
+++ b/icu4c/source/i18n/unicode/cpdtrans.h
@@ -32,7 +32,7 @@
* Copyright © IBM Corporation 1999. All rights reserved.
*
* @author Alan Liu
- * @version $RCSfile: cpdtrans.h,v $ $Revision: 1.7 $ $Date: 2000/03/22 19:19:33 $
+ * @version $RCSfile: cpdtrans.h,v $ $Revision: 1.8 $ $Date: 2000/05/18 22:08:27 $
* @draft
*/
class U_I18N_API CompoundTransliterator : public Transliterator {
@@ -141,7 +141,7 @@ public:
* @draft
*/
virtual void handleTransliterate(Replaceable& text, Position& index,
- bool_t incremental) const;
+ UBool incremental) const;
private:
diff --git a/icu4c/source/i18n/unicode/datefmt.h b/icu4c/source/i18n/unicode/datefmt.h
index 9df68e7aab5..9f24fb2f551 100644
--- a/icu4c/source/i18n/unicode/datefmt.h
+++ b/icu4c/source/i18n/unicode/datefmt.h
@@ -210,7 +210,7 @@ public:
* Equality operator. Returns true if the two formats have the same behavior.
* @stable
*/
- virtual bool_t operator==(const Format&) const;
+ virtual UBool operator==(const Format&) const;
/**
* Format an object to produce a string. This method handles Formattable
@@ -413,7 +413,7 @@ public:
* Returns true if the formatter is set for lenient parsing.
* @stable
*/
- virtual bool_t isLenient(void) const;
+ virtual UBool isLenient(void) const;
/**
* Specify whether or not date/time parsing is to be lenient. With lenient
@@ -423,7 +423,7 @@ public:
* @see Calendar::setLenient
* @stable
*/
- virtual void setLenient(bool_t lenient);
+ virtual void setLenient(UBool lenient);
/**
* Gets the calendar associated with this date/time formatter.
diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h
index 5d38aac5700..a0a2df66ecd 100644
--- a/icu4c/source/i18n/unicode/dcfmtsym.h
+++ b/icu4c/source/i18n/unicode/dcfmtsym.h
@@ -110,13 +110,13 @@ public:
* Return true if another object is semantically equal to this one.
* @stable
*/
- bool_t operator==(const DecimalFormatSymbols& other) const;
+ UBool operator==(const DecimalFormatSymbols& other) const;
/**
* Return true if another object is semantically unequal to this one.
* @stable
*/
- bool_t operator!=(const DecimalFormatSymbols& other) const { return !operator==(other); }
+ UBool operator!=(const DecimalFormatSymbols& other) const { return !operator==(other); }
/**
* character used for zero. Different for Arabic, etc.
@@ -328,7 +328,7 @@ private:
* Note: The organization of LocaleElements badly needs to be
* cleaned up.
*/
- void initialize(const Locale& locale, UErrorCode& success, bool_t useLastResortData = FALSE);
+ void initialize(const Locale& locale, UErrorCode& success, UBool useLastResortData = FALSE);
/**
* Initialize the symbols from the given array of UnicodeStrings.
diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h
index 1103c051b33..b771f0ef5d7 100644
--- a/icu4c/source/i18n/unicode/decimfmt.h
+++ b/icu4c/source/i18n/unicode/decimfmt.h
@@ -285,7 +285,7 @@ public:
* Objects of different subclasses are considered unequal.
* @stable
*/
- virtual bool_t operator==(const Format& other) const;
+ virtual UBool operator==(const Format& other) const;
/**
* Format a double or long number using base-10 representation.
@@ -614,7 +614,7 @@ public:
* @see #setExponentSignAlwaysShown
* @stable
*/
- virtual bool_t isScientificNotation(void);
+ virtual UBool isScientificNotation(void);
/**
* Set whether or not scientific notation is used.
@@ -627,7 +627,7 @@ public:
* @see #setExponentSignAlwaysShown
* @stable
*/
- virtual void setScientificNotation(bool_t useScientific);
+ virtual void setScientificNotation(UBool useScientific);
/**
* Return the minimum exponent digits that will be shown.
@@ -667,7 +667,7 @@ public:
* @see #setExponentSignAlwaysShown
* @stable
*/
- virtual bool_t isExponentSignAlwaysShown(void);
+ virtual UBool isExponentSignAlwaysShown(void);
/**
* Set whether the exponent sign is always shown. This has no effect
@@ -682,7 +682,7 @@ public:
* @see #isExponentSignAlwaysShown
* @stable
*/
- virtual void setExponentSignAlwaysShown(bool_t expSignAlways);
+ virtual void setExponentSignAlwaysShown(UBool expSignAlways);
/**
* Return the grouping size. Grouping size is the number of digits between
@@ -713,7 +713,7 @@ public:
* Example: Decimal ON: 12345 -> 12345.; OFF: 12345 -> 12345
* @stable
*/
- bool_t isDecimalSeparatorAlwaysShown(void) const;
+ UBool isDecimalSeparatorAlwaysShown(void) const;
/**
* Allows you to set the behavior of the decimal separator with integers.
@@ -722,7 +722,7 @@ public:
* Example: Decimal ON: 12345 -> 12345.; OFF: 12345 -> 12345
* @stable
*/
- virtual void setDecimalSeparatorAlwaysShown(bool_t newValue);
+ virtual void setDecimalSeparatorAlwaysShown(UBool newValue);
/**
* Synthesizes a pattern string that represents the current state
@@ -883,7 +883,7 @@ private:
/**
* Does the real work of generating a pattern.
*/
- UnicodeString& toPattern(UnicodeString& result, bool_t localized) const;
+ UnicodeString& toPattern(UnicodeString& result, UBool localized) const;
/**
* Does the real work of applying a pattern.
@@ -894,7 +894,7 @@ private:
* set to a failure result.
*/
void applyPattern(const UnicodeString& pattern,
- bool_t localized,
+ UBool localized,
UErrorCode& status);
/**
@@ -902,8 +902,8 @@ private:
*/
UnicodeString& subformat(UnicodeString& result,
FieldPosition& fieldPosition,
- bool_t isNegative,
- bool_t isInteger) const;
+ UBool isNegative,
+ UBool isInteger) const;
static const int32_t fgStatusInfinite;
static const int32_t fgStatusPositive;
@@ -921,9 +921,9 @@ private:
* @param status Upon return contains boolean status flags indicating
* whether the value was infinite and whether it was positive.
*/
- bool_t subparse(const UnicodeString& text, ParsePosition& parsePosition,
- DigitList& digits, bool_t isExponent,
- bool_t* status) const;
+ UBool subparse(const UnicodeString& text, ParsePosition& parsePosition,
+ DigitList& digits, UBool isExponent,
+ UBool* status) const;
/**
* Append an affix to the given StringBuffer, using quotes if
@@ -931,21 +931,21 @@ private:
* escaped in either case.
*/
void appendAffix(UnicodeString& buffer, const UnicodeString& affix,
- bool_t localized) const;
+ UBool localized) const;
void appendAffix(UnicodeString& buffer,
const UnicodeString* affixPattern,
- const UnicodeString& expAffix, bool_t localized) const;
+ const UnicodeString& expAffix, UBool localized) const;
void expandAffix(const UnicodeString& pattern,
UnicodeString& affix) const;
void expandAffixes(void);
- static double round(double a, ERoundingMode mode, bool_t isNegative);
+ static double round(double a, ERoundingMode mode, UBool isNegative);
- void addPadding(UnicodeString& result, bool_t hasAffixes,
- bool_t isNegative) const;
+ void addPadding(UnicodeString& result, UBool hasAffixes,
+ UBool isNegative) const;
/**
* Constants.
@@ -964,13 +964,13 @@ private:
UnicodeString* fNegSuffixPattern;
int32_t fMultiplier;
int32_t fGroupingSize;
- bool_t fDecimalSeparatorAlwaysShown;
- /*transient*/ bool_t fIsCurrencyFormat;
+ UBool fDecimalSeparatorAlwaysShown;
+ /*transient*/ UBool fIsCurrencyFormat;
DecimalFormatSymbols* fSymbols;
- bool_t fUseExponentialNotation;
+ UBool fUseExponentialNotation;
int8_t fMinExponentDigits;
- bool_t fExponentSignAlwaysShown;
+ UBool fExponentSignAlwaysShown;
/* If fRoundingIncrement is NULL, there is no rounding. Otherwise, round to
* fRoundingIncrement.getDouble(). Since this operation may be expensive,
diff --git a/icu4c/source/i18n/unicode/dtfmtsym.h b/icu4c/source/i18n/unicode/dtfmtsym.h
index 0125e82e0e8..632650ea8b9 100644
--- a/icu4c/source/i18n/unicode/dtfmtsym.h
+++ b/icu4c/source/i18n/unicode/dtfmtsym.h
@@ -108,13 +108,13 @@ public:
* Return true if another object is semantically equal to this one.
* @stable
*/
- bool_t operator==(const DateFormatSymbols& other) const;
+ UBool operator==(const DateFormatSymbols& other) const;
/**
* Return true if another object is semantically unequal to this one.
* @stable
*/
- bool_t operator!=(const DateFormatSymbols& other) const { return !operator==(other); }
+ UBool operator!=(const DateFormatSymbols& other) const { return !operator==(other); }
/**
* Gets era strings. For example: "AD" and "BC".
@@ -304,7 +304,7 @@ private:
/**
* Called by the constructors to actually load data from the resources
*/
- void initializeData(const Locale&, UErrorCode& status, bool_t useLastResortData = FALSE);
+ void initializeData(const Locale&, UErrorCode& status, UBool useLastResortData = FALSE);
/**
* Copy or alias an array in another object, as appropriate.
@@ -320,7 +320,7 @@ private:
* Return true if the given arrays' contents are equal, or if the arrays are
* identical (pointers are equal).
*/
- static bool_t arrayCompare(const UnicodeString* array1,
+ static UBool arrayCompare(const UnicodeString* array1,
const UnicodeString* array2,
int32_t count);
@@ -388,21 +388,21 @@ private:
/**
* Sets the fIsOwned flag for the specfied string array
*/
- void setIsOwned(int32_t which, bool_t isOwned);
+ void setIsOwned(int32_t which, UBool isOwned);
/**
* Tests the fIsOwned flag for the specified string array
*/
- bool_t isOwned(int32_t which) const;
+ UBool isOwned(int32_t which) const;
};
inline void
-DateFormatSymbols::setIsOwned(int32_t which, bool_t isOwned)
+DateFormatSymbols::setIsOwned(int32_t which, UBool isOwned)
{
fIsOwned = ( fIsOwned & ~(1 << which) ) | ( (isOwned ? 1 : 0) << which );
}
-inline bool_t
+inline UBool
DateFormatSymbols::isOwned(int32_t which) const
{
return ( (fIsOwned >> which) & 1 ) != 0;
diff --git a/icu4c/source/i18n/unicode/fieldpos.h b/icu4c/source/i18n/unicode/fieldpos.h
index 2827417a5ef..e57ec3c6aa9 100644
--- a/icu4c/source/i18n/unicode/fieldpos.h
+++ b/icu4c/source/i18n/unicode/fieldpos.h
@@ -139,14 +139,14 @@ public:
* @return TRUE if the two field positions are equal, FALSE otherwise.
* @stable
*/
- bool_t operator==(const FieldPosition& that) const;
+ UBool operator==(const FieldPosition& that) const;
/**
* Equality operator.
* @return TRUE if the two field positions are not equal, FALSE otherwise.
* @stable
*/
- bool_t operator!=(const FieldPosition& that) const;
+ UBool operator!=(const FieldPosition& that) const;
/**
* Retrieve the field identifier.
@@ -214,7 +214,7 @@ FieldPosition::operator=(const FieldPosition& copy)
return *this;
}
-inline bool_t
+inline UBool
FieldPosition::operator==(const FieldPosition& copy) const
{
if( fField != copy.fField ||
@@ -225,7 +225,7 @@ FieldPosition::operator==(const FieldPosition& copy) const
return TRUE;
}
-inline bool_t
+inline UBool
FieldPosition::operator!=(const FieldPosition& copy) const
{
return !operator==(copy);
diff --git a/icu4c/source/i18n/unicode/fmtable.h b/icu4c/source/i18n/unicode/fmtable.h
index a3233aab869..0555d475a99 100644
--- a/icu4c/source/i18n/unicode/fmtable.h
+++ b/icu4c/source/i18n/unicode/fmtable.h
@@ -108,8 +108,8 @@ public:
* Equality comparison.
* @stable
*/
- bool_t operator==(const Formattable&) const;
- bool_t operator!=(const Formattable& other) const
+ UBool operator==(const Formattable&) const;
+ UBool operator!=(const Formattable& other) const
{ return !operator==(other); }
/**
diff --git a/icu4c/source/i18n/unicode/format.h b/icu4c/source/i18n/unicode/format.h
index c7da19b9371..352cbf8f92b 100644
--- a/icu4c/source/i18n/unicode/format.h
+++ b/icu4c/source/i18n/unicode/format.h
@@ -89,14 +89,14 @@ public:
* Objects of different subclasses are considered unequal.
* @stable
*/
- virtual bool_t operator==(const Format& other) const = 0;
+ virtual UBool operator==(const Format& other) const = 0;
/**
* Return true if the given Format objects are not semantically
* equal.
* @stable
*/
- bool_t operator!=(const Format& other) const { return !operator==(other); }
+ UBool operator!=(const Format& other) const { return !operator==(other); }
/**
* Clone this object polymorphically. The caller is responsible
diff --git a/icu4c/source/i18n/unicode/gregocal.h b/icu4c/source/i18n/unicode/gregocal.h
index a1a92526a09..87f7c8fdc86 100644
--- a/icu4c/source/i18n/unicode/gregocal.h
+++ b/icu4c/source/i18n/unicode/gregocal.h
@@ -316,7 +316,7 @@ public:
* @return True if the given year is a leap year; false otherwise.
* @stable
*/
- bool_t isLeapYear(int32_t year) const;
+ UBool isLeapYear(int32_t year) const;
/**
* Compares the equality of two GregorianCalendar objects. Objects of different
@@ -328,7 +328,7 @@ public:
* GregorianCalendar; false otherwise.
* @stable
*/
- virtual bool_t operator==(const Calendar& that) const;
+ virtual UBool operator==(const Calendar& that) const;
/**
* Calendar override.
@@ -336,7 +336,7 @@ public:
* Calendar will behave exactly as this one does, but may be set to a different time.
* @stable
*/
- virtual bool_t equivalentTo(const Calendar& other) const;
+ virtual UBool equivalentTo(const Calendar& other) const;
/**
* (Overrides Calendar) UDate Arithmetic function. Adds the specified (signed) amount
@@ -418,7 +418,7 @@ public:
* false, otherwise.
* @stable
*/
- virtual bool_t inDaylightTime(UErrorCode& status) const;
+ virtual UBool inDaylightTime(UErrorCode& status) const;
public:
@@ -499,8 +499,8 @@ private:
*/
UDate getEpochDay(UErrorCode& status);
- static double computeJulianDayOfYear(bool_t isGregorian, int32_t year,
- bool_t& isLeap);
+ static double computeJulianDayOfYear(UBool isGregorian, int32_t year,
+ UBool& isLeap);
int32_t computeRelativeDOW() const;
@@ -516,7 +516,7 @@ private:
* year 1 BC, -1 indicating 2 BC, etc.
* @return the Julian day number
*/
- double computeJulianDay(bool_t isGregorian, int32_t year);
+ double computeJulianDay(UBool isGregorian, int32_t year);
/**
* Compute the date-based fields given the milliseconds since the epoch start. Do
@@ -527,7 +527,7 @@ private:
* @param quick if true, only compute the ERA, YEAR, MONTH, DATE,
* DAY_OF_WEEK, and DAY_OF_YEAR.
*/
- void timeToFields(UDate theTime, bool_t quick, UErrorCode& status);
+ void timeToFields(UDate theTime, UBool quick, UErrorCode& status);
/**
@@ -549,12 +549,12 @@ private:
/**
* Validates the values of the set time fields. True if they're all valid.
*/
- bool_t validateFields(void) const;
+ UBool validateFields(void) const;
/**
* Validates the value of the given time field. True if it's valid.
*/
- bool_t boundsCheck(int32_t value, EDateFields field) const;
+ UBool boundsCheck(int32_t value, EDateFields field) const;
/**
* Return the pseudo-time-stamp for two fields, given their
diff --git a/icu4c/source/i18n/unicode/hangjamo.h b/icu4c/source/i18n/unicode/hangjamo.h
index 7376e16b159..dd66ad19f24 100644
--- a/icu4c/source/i18n/unicode/hangjamo.h
+++ b/icu4c/source/i18n/unicode/hangjamo.h
@@ -16,7 +16,7 @@
* A transliterator that converts Hangul to Jamo.
*
* @author Mark Davis
- * @version $RCSfile: hangjamo.h,v $ $Revision: 1.3 $ $Date: 2000/01/19 19:02:10 $
+ * @version $RCSfile: hangjamo.h,v $ $Revision: 1.4 $ $Date: 2000/05/18 22:08:27 $
*/
class U_I18N_API HangulJamoTransliterator : public Transliterator {
@@ -56,11 +56,11 @@ public:
* Implements {@link Transliterator#handleTransliterate}.
*/
virtual void handleTransliterate(Replaceable& text, Position& offsets,
- bool_t isIncremental) const;
+ UBool isIncremental) const;
private:
- static bool_t decomposeHangul(UChar s, UnicodeString& result);
+ static UBool decomposeHangul(UChar s, UnicodeString& result);
};
inline HangulJamoTransliterator::~HangulJamoTransliterator() {}
diff --git a/icu4c/source/i18n/unicode/hextouni.h b/icu4c/source/i18n/unicode/hextouni.h
index b808a70e4a0..61735985c31 100644
--- a/icu4c/source/i18n/unicode/hextouni.h
+++ b/icu4c/source/i18n/unicode/hextouni.h
@@ -22,7 +22,7 @@
*
Copyright © IBM Corporation 1999. All rights reserved.
*
* @author Alan Liu
- * @version $RCSfile: hextouni.h,v $ $Revision: 1.5 $ $Date: 2000/03/22 19:19:33 $
+ * @version $RCSfile: hextouni.h,v $ $Revision: 1.6 $ $Date: 2000/05/18 22:08:27 $
* @draft
*/
class U_I18N_API HexToUnicodeTransliterator : public Transliterator {
@@ -149,7 +149,7 @@ public:
* @draft
*/
virtual void handleTransliterate(Replaceable& text, Position& offset,
- bool_t isIncremental) const;
+ UBool isIncremental) const;
};
inline HexToUnicodeTransliterator::~HexToUnicodeTransliterator() {}
diff --git a/icu4c/source/i18n/unicode/jamohang.h b/icu4c/source/i18n/unicode/jamohang.h
index 2c0b91f3948..7b1fbb1b6c4 100644
--- a/icu4c/source/i18n/unicode/jamohang.h
+++ b/icu4c/source/i18n/unicode/jamohang.h
@@ -16,7 +16,7 @@
* A transliterator that converts Jamo to Hangul.
*
* @author Mark Davis
- * @version $RCSfile: jamohang.h,v $ $Revision: 1.4 $ $Date: 2000/01/19 19:02:10 $
+ * @version $RCSfile: jamohang.h,v $ $Revision: 1.5 $ $Date: 2000/05/18 22:08:27 $
*/
class U_I18N_API JamoHangulTransliterator : public Transliterator {
@@ -56,7 +56,7 @@ public:
* Implements {@link Transliterator#handleTransliterate}.
*/
virtual void handleTransliterate(Replaceable& text, Position& offsets,
- bool_t isIncremental) const;
+ UBool isIncremental) const;
private:
diff --git a/icu4c/source/i18n/unicode/msgfmt.h b/icu4c/source/i18n/unicode/msgfmt.h
index adab1189d60..0f138a766d3 100644
--- a/icu4c/source/i18n/unicode/msgfmt.h
+++ b/icu4c/source/i18n/unicode/msgfmt.h
@@ -229,7 +229,7 @@ public:
* Objects of different subclasses are considered unequal.
* @stable
*/
- virtual bool_t operator==(const Format& other) const;
+ virtual UBool operator==(const Format& other) const;
/**
* Sets the locale. This locale is used for fetching default number or date
diff --git a/icu4c/source/i18n/unicode/nultrans.h b/icu4c/source/i18n/unicode/nultrans.h
index 5f9a31c5eea..93ba5d37bd0 100644
--- a/icu4c/source/i18n/unicode/nultrans.h
+++ b/icu4c/source/i18n/unicode/nultrans.h
@@ -56,7 +56,7 @@ public:
* Implements {@link Transliterator#handleTransliterate}.
*/
virtual void handleTransliterate(Replaceable& text, Position& offset,
- bool_t isIncremental) const;
+ UBool isIncremental) const;
};
inline NullTransliterator::NullTransliterator() : Transliterator(_ID, 0) {}
diff --git a/icu4c/source/i18n/unicode/numfmt.h b/icu4c/source/i18n/unicode/numfmt.h
index bb2865e2c9f..d69d090e009 100644
--- a/icu4c/source/i18n/unicode/numfmt.h
+++ b/icu4c/source/i18n/unicode/numfmt.h
@@ -144,7 +144,7 @@ public:
* Objects of different subclasses are considered unequal.
* @stable
*/
- virtual bool_t operator==(const Format& other) const;
+ virtual UBool operator==(const Format& other) const;
/**
* Format an object to produce a string. This method handles
@@ -292,14 +292,14 @@ public:
* dependant and determined by sub-classes of NumberFormat.
* @stable
*/
- bool_t isParseIntegerOnly(void) const;
+ UBool isParseIntegerOnly(void) const;
/**
* Sets whether or not numbers should be parsed as integers only.
* @see isParseIntegerOnly
* @stable
*/
- virtual void setParseIntegerOnly(bool_t value);
+ virtual void setParseIntegerOnly(UBool value);
/**
* Returns the default number format for the current default
@@ -375,14 +375,14 @@ public:
* @see setGroupingUsed
* @stable
*/
- bool_t isGroupingUsed(void) const;
+ UBool isGroupingUsed(void) const;
/**
* Set whether or not grouping will be used in this format.
* @see getGroupingUsed
* @stable
*/
- virtual void setGroupingUsed(bool_t newValue);
+ virtual void setGroupingUsed(UBool newValue);
/**
* Returns the maximum number of digits allowed in the integer portion of a
@@ -530,17 +530,17 @@ private:
static const int32_t fgNumberPatternsCount;
static const UnicodeString fgLastResortNumberPatterns[];
- bool_t fGroupingUsed;
+ UBool fGroupingUsed;
int32_t fMaxIntegerDigits;
int32_t fMinIntegerDigits;
int32_t fMaxFractionDigits;
int32_t fMinFractionDigits;
- bool_t fParseIntegerOnly;
+ UBool fParseIntegerOnly;
};
// -------------------------------------
-inline bool_t
+inline UBool
NumberFormat::isParseIntegerOnly() const
{
return fParseIntegerOnly;
diff --git a/icu4c/source/i18n/unicode/parsepos.h b/icu4c/source/i18n/unicode/parsepos.h
index ac359ac347d..5b9893178ea 100644
--- a/icu4c/source/i18n/unicode/parsepos.h
+++ b/icu4c/source/i18n/unicode/parsepos.h
@@ -76,14 +76,14 @@ public:
* @return TRUE if the two parse positions are equal, FALSE otherwise.
* @stable
*/
- bool_t operator==(const ParsePosition& that) const;
+ UBool operator==(const ParsePosition& that) const;
/**
* Equality operator.
* @return TRUE if the two parse positions are not equal, FALSE otherwise.
* @stable
*/
- bool_t operator!=(const ParsePosition& that) const;
+ UBool operator!=(const ParsePosition& that) const;
/**
* Retrieve the current parse position. On input to a parse method, this
@@ -140,7 +140,7 @@ ParsePosition::operator=(const ParsePosition& copy)
return *this;
}
-inline bool_t
+inline UBool
ParsePosition::operator==(const ParsePosition& copy) const
{
if(index != copy.index || errorIndex != copy.errorIndex)
@@ -149,7 +149,7 @@ ParsePosition::operator==(const ParsePosition& copy) const
return TRUE;
}
-inline bool_t
+inline UBool
ParsePosition::operator!=(const ParsePosition& copy) const
{
return !operator==(copy);
diff --git a/icu4c/source/i18n/unicode/rbbi.h b/icu4c/source/i18n/unicode/rbbi.h
index ed07d8fd591..2661ec979be 100644
--- a/icu4c/source/i18n/unicode/rbbi.h
+++ b/icu4c/source/i18n/unicode/rbbi.h
@@ -254,13 +254,13 @@ RuleBasedBreakIterator(const void* image);
* Equality operator. Returns TRUE if both BreakIterators are of the
* same class, have the same behavior, and iterate over the same text.
*/
- virtual bool_t operator==(const BreakIterator& that) const;
+ virtual UBool operator==(const BreakIterator& that) const;
/**
* Not-equal operator. If operator== returns TRUE, this returns FALSE,
* and vice versa.
*/
- bool_t operator!=(const BreakIterator& that) const;
+ UBool operator!=(const BreakIterator& that) const;
/**
* Returns a newly-constructed RuleBasedBreakIterator with the same
@@ -386,7 +386,7 @@ RuleBasedBreakIterator(const void* image);
* @param offset the offset to check.
* @return True if "offset" is a boundary position.
*/
- virtual bool_t isBoundary(int32_t offset);
+ virtual UBool isBoundary(int32_t offset);
/**
* Returns the current iteration position.
@@ -458,7 +458,7 @@ private:
friend class BreakIterator;
};
-inline bool_t RuleBasedBreakIterator::operator!=(const BreakIterator& that) const {
+inline UBool RuleBasedBreakIterator::operator!=(const BreakIterator& that) const {
return !operator==(that);
}
diff --git a/icu4c/source/i18n/unicode/rbt.h b/icu4c/source/i18n/unicode/rbt.h
index 37d21377c4a..3e81cd2972d 100644
--- a/icu4c/source/i18n/unicode/rbt.h
+++ b/icu4c/source/i18n/unicode/rbt.h
@@ -219,7 +219,7 @@ class U_I18N_API RuleBasedTransliterator : public Transliterator {
/**
* If true, we own the data object and must delete it.
*/
- bool_t isDataOwned;
+ UBool isDataOwned;
public:
@@ -304,7 +304,7 @@ public:
* @draft
*/
virtual void handleTransliterate(Replaceable& text, Position& offsets,
- bool_t isIncremental) const;
+ UBool isIncremental) const;
/**
* Parse error codes generated by RuleBasedTransliterator.
diff --git a/icu4c/source/i18n/unicode/simpletz.h b/icu4c/source/i18n/unicode/simpletz.h
index 97e609c2dd5..d2035295875 100644
--- a/icu4c/source/i18n/unicode/simpletz.h
+++ b/icu4c/source/i18n/unicode/simpletz.h
@@ -91,7 +91,7 @@ public:
* otherwise.
* @stable
*/
- virtual bool_t operator==(const TimeZone& that) const;
+ virtual UBool operator==(const TimeZone& that) const;
/**
* Constructs a SimpleTimeZone with the given raw GMT offset and time zone ID,
@@ -264,10 +264,10 @@ public:
* @stable
*/
void setStartRule(int32_t month, int32_t dayOfMonth, int32_t dayOfWeek,
- int32_t time, bool_t after, UErrorCode& status);
+ int32_t time, UBool after, UErrorCode& status);
void setStartRule(int32_t month, int32_t dayOfMonth, int32_t dayOfWeek,
- int32_t time, TimeMode mode, bool_t after, UErrorCode& status);
+ int32_t time, TimeMode mode, UBool after, UErrorCode& status);
/**
* Sets the daylight savings ending rule. For example, in the U.S., Daylight
@@ -336,10 +336,10 @@ public:
* @stable
*/
void setEndRule(int32_t month, int32_t dayOfMonth, int32_t dayOfWeek,
- int32_t time, bool_t after, UErrorCode& status);
+ int32_t time, UBool after, UErrorCode& status);
void setEndRule(int32_t month, int32_t dayOfMonth, int32_t dayOfWeek,
- int32_t time, TimeMode mode, bool_t after, UErrorCode& status);
+ int32_t time, TimeMode mode, UBool after, UErrorCode& status);
/**
* Returns the TimeZone's adjusted GMT offset (i.e., the number of milliseconds to add
@@ -436,7 +436,7 @@ public:
* @return True if this TimeZone uses Daylight Savings Time; false otherwise.
* @stable
*/
- virtual bool_t useDaylightTime(void) const;
+ virtual UBool useDaylightTime(void) const;
/**
* Returns true if the given date is within the period when daylight savings time
@@ -447,7 +447,7 @@ public:
* false otherwise.
* @stable
*/
- virtual bool_t inDaylightTime(UDate date, UErrorCode& status) const;
+ virtual UBool inDaylightTime(UDate date, UErrorCode& status) const;
/**
* Return true if this zone has the same rules and offset as another zone.
@@ -455,7 +455,7 @@ public:
* @return true if the given zone has the same rules and offset as this one
* @stable
*/
- bool_t hasSameRules(const TimeZone& other) const;
+ UBool hasSameRules(const TimeZone& other) const;
/**
* Clones TimeZone objects polymorphically. Clients are responsible for deleting
@@ -566,7 +566,7 @@ private:
int32_t endTime;
int32_t startYear; // the year these DST rules took effect
int32_t rawOffset; // the TimeZone's raw GMT offset
- bool_t useDaylight; // flag indicating whether this TimeZone uses DST
+ UBool useDaylight; // flag indicating whether this TimeZone uses DST
static const int8_t staticMonthLength[12]; // lengths of the months
EMode startMode, endMode; // flags indicating what kind of rules the DST rules are
@@ -591,7 +591,7 @@ inline void SimpleTimeZone::setStartRule(int32_t month, int32_t dayOfMonth,
inline void SimpleTimeZone::setStartRule(int32_t month, int32_t dayOfMonth,
int32_t dayOfWeek,
- int32_t time, bool_t after, UErrorCode& status) {
+ int32_t time, UBool after, UErrorCode& status) {
setStartRule(month, dayOfMonth, dayOfWeek, time, WALL_TIME, after, status);
}
@@ -607,7 +607,7 @@ inline void SimpleTimeZone::setEndRule(int32_t month, int32_t dayOfMonth,
}
inline void SimpleTimeZone::setEndRule(int32_t month, int32_t dayOfMonth, int32_t dayOfWeek,
- int32_t time, bool_t after, UErrorCode& status) {
+ int32_t time, UBool after, UErrorCode& status) {
setEndRule(month, dayOfMonth, dayOfWeek, time, WALL_TIME, after, status);
}
diff --git a/icu4c/source/i18n/unicode/smpdtfmt.h b/icu4c/source/i18n/unicode/smpdtfmt.h
index 22a446b0a95..517e7cd606a 100644
--- a/icu4c/source/i18n/unicode/smpdtfmt.h
+++ b/icu4c/source/i18n/unicode/smpdtfmt.h
@@ -250,7 +250,7 @@ public:
* of different subclasses are considered unequal.
* @stable
*/
- virtual bool_t operator==(const Format& other) const;
+ virtual UBool operator==(const Format& other) const;
/**
* Format a date or time, which is the standard millis since 24:00 GMT, Jan
@@ -615,7 +615,7 @@ private:
* @draft
*/
int32_t subParse(const UnicodeString& text, int32_t& start, UChar ch, int32_t count,
- bool_t obeyCount, bool_t ambiguousYear[]) const;
+ UBool obeyCount, UBool ambiguousYear[]) const;
/**
* Parse the given text, at the given position, as a numeric value, using
@@ -624,7 +624,7 @@ private:
* unchanged and returns FALSE; otherwise it advances pos and
* returns TRUE.
*/
- //bool_t subParseLong(const UnicodeString& text, ParsePosition& pos, int32_t& value) const;
+ //UBool subParseLong(const UnicodeString& text, ParsePosition& pos, int32_t& value) const;
/**
* Translate a pattern, mapping each character in the from string to the
diff --git a/icu4c/source/i18n/unicode/sortkey.h b/icu4c/source/i18n/unicode/sortkey.h
index b8b2edf6c8e..99ef7978c51 100644
--- a/icu4c/source/i18n/unicode/sortkey.h
+++ b/icu4c/source/i18n/unicode/sortkey.h
@@ -124,7 +124,7 @@ public:
* @return Returns true if two collation keys are equal, false otherwise.
* @deprecated
*/
- bool_t operator==(const CollationKey& source) const;
+ UBool operator==(const CollationKey& source) const;
/**
* Compare if two collation keys are not the same.
@@ -132,7 +132,7 @@ public:
* @return Returns TRUE if two collation keys are different, FALSE otherwise.
* @deprecated
*/
- bool_t operator!=(const CollationKey& source) const;
+ UBool operator!=(const CollationKey& source) const;
/**
@@ -141,7 +141,7 @@ public:
* @return Returns TRUE if the key is in an invalid, FALSE otherwise.
* @deprecated
*/
- bool_t isBogus(void) const;
+ UBool isBogus(void) const;
/**
* Returns a pointer to the collation key values. The storage is owned
@@ -223,20 +223,20 @@ private:
static const int32_t kInvalidHashCode;
static const int32_t kEmptyHashCode;
- bool_t fBogus;
+ UBool fBogus;
int32_t fCount;
int32_t fCapacity;
int32_t fHashCode;
uint8_t* fBytes;
};
-inline bool_t
+inline UBool
CollationKey::operator!=(const CollationKey& other) const
{
return !(*this == other);
}
-inline bool_t
+inline UBool
CollationKey::isBogus() const
{
return fBogus;
diff --git a/icu4c/source/i18n/unicode/tblcoll.h b/icu4c/source/i18n/unicode/tblcoll.h
index 4e5ca8f2a3d..70ce824305b 100644
--- a/icu4c/source/i18n/unicode/tblcoll.h
+++ b/icu4c/source/i18n/unicode/tblcoll.h
@@ -366,13 +366,13 @@ public:
* Returns true if "other" is the same as "this".
* @stable
*/
- virtual bool_t operator==(const Collator& other) const;
+ virtual UBool operator==(const Collator& other) const;
/**
* Returns true if "other" is not the same as "this".
* @stable
*/
- virtual bool_t operator!=(const Collator& other) const;
+ virtual UBool operator!=(const Collator& other) const;
/**
* Makes a deep copy of the object. The caller owns the returned object.
@@ -663,7 +663,7 @@ private:
*/
void addContractOrder(const UnicodeString& groupChars,
int32_t anOrder,
- bool_t fwd,
+ UBool fwd,
UErrorCode& status);
/**
* If the given string has been specified as a contracting string
@@ -715,7 +715,7 @@ private:
*/
static int32_t getEntry( VectorOfPToContractElement* list,
const UnicodeString& name,
- bool_t fwd);
+ UBool fwd);
/**
* Flattens the given object persistently to a file. The file name
@@ -726,7 +726,7 @@ private:
* @param fileName the output file name.
* @return TRUE if writing to the file was successful, FALSE otherwise.
*/
- bool_t writeToFile(const char* fileName) const; // True on success
+ UBool writeToFile(const char* fileName) const; // True on success
/**
* Add this table collation to the cache. This involves adding the
@@ -765,7 +765,7 @@ private:
UErrorCode& status);
void constructFromFile( const Locale& locale,
const UnicodeString& localeFileName,
- bool_t tryBinaryFile,
+ UBool tryBinaryFile,
UErrorCode& status);
void constructFromFile( const char* fileName,
UErrorCode& status);
@@ -835,7 +835,7 @@ private:
//--------------------------------------------------------------------------
// Data Members
- bool_t isOverIgnore;
+ UBool isOverIgnore;
UChar lastChar;
MergeCollation* mPattern;
UnicodeString sbuffer;
@@ -843,11 +843,11 @@ private:
UnicodeString key;
NormalizerIterator *cursor1;
NormalizerIterator *cursor2;
- bool_t dataIsOwned;
+ UBool dataIsOwned;
TableCollationData* data;
};
-inline bool_t
+inline UBool
RuleBasedCollator::operator!=(const Collator& other) const
{
return !(*this == other);
diff --git a/icu4c/source/i18n/unicode/timezone.h b/icu4c/source/i18n/unicode/timezone.h
index d83e4fa0cb2..740fb449a44 100644
--- a/icu4c/source/i18n/unicode/timezone.h
+++ b/icu4c/source/i18n/unicode/timezone.h
@@ -214,7 +214,7 @@ public:
* otherwise.
* @stable
*/
- virtual bool_t operator==(const TimeZone& that) const;
+ virtual UBool operator==(const TimeZone& that) const;
/**
* Returns true if the two TimeZones are NOT equal; that is, if operator==() returns
@@ -225,7 +225,7 @@ public:
* otherwise.
* @stable
*/
- bool_t operator!=(const TimeZone& that) const {return !operator==(that);}
+ UBool operator!=(const TimeZone& that) const {return !operator==(that);}
/**
* Returns the TimeZone's adjusted GMT offset (i.e., the number of milliseconds to add
@@ -360,7 +360,7 @@ public:
* @return the human-readable name of this time zone in the default locale.
* @stable
*/
- UnicodeString& getDisplayName(bool_t daylight, EDisplayType style, UnicodeString& result) const;
+ UnicodeString& getDisplayName(UBool daylight, EDisplayType style, UnicodeString& result) const;
/**
* Returns a name of this time zone suitable for presentation to the user
@@ -375,7 +375,7 @@ public:
* or in the default locale if the given locale is not recognized.
* @stable
*/
- UnicodeString& getDisplayName(bool_t daylight, EDisplayType style, const Locale& locale, UnicodeString& result) const;
+ UnicodeString& getDisplayName(UBool daylight, EDisplayType style, const Locale& locale, UnicodeString& result) const;
/**
* Queries if this time zone uses daylight savings time.
@@ -383,7 +383,7 @@ public:
* false, otherwise.
* @stable
*/
- virtual bool_t useDaylightTime(void) const = 0;
+ virtual UBool useDaylightTime(void) const = 0;
/**
* Queries if the given date is in daylight savings time in
@@ -393,7 +393,7 @@ public:
* false, otherwise.
* @deprecated
*/
- virtual bool_t inDaylightTime(UDate date, UErrorCode& status) const = 0;
+ virtual UBool inDaylightTime(UDate date, UErrorCode& status) const = 0;
/**
* Returns true if this zone has the same rule and offset as another zone.
@@ -403,7 +403,7 @@ public:
* with the possible exception of the ID
* @stable
*/
- virtual bool_t hasSameRules(const TimeZone& other) const;
+ virtual UBool hasSameRules(const TimeZone& other) const;
/**
* Clones TimeZone objects polymorphically. Clients are responsible for deleting
@@ -517,7 +517,7 @@ private:
* made. If DATA_LOADED is true, DATA itself will be zero if
* loading failed, or non-zero if it succeeded.
*/
- static bool_t DATA_LOADED;
+ static UBool DATA_LOADED;
/**
* The mutex object used to control write access to DATA,
@@ -537,7 +537,7 @@ private:
static void loadZoneData(void);
// See source file for documentation
- static bool_t U_CALLCONV isDataAcceptable(void *context,
+ static UBool U_CALLCONV isDataAcceptable(void *context,
const char *type, const char *name,
const UDataInfo *pInfo);
diff --git a/icu4c/source/i18n/unicode/translit.h b/icu4c/source/i18n/unicode/translit.h
index 50b34045b34..40e04ea4107 100644
--- a/icu4c/source/i18n/unicode/translit.h
+++ b/icu4c/source/i18n/unicode/translit.h
@@ -337,7 +337,7 @@ private:
* the code as part of a shared library, and (2) to avoid static
* intialization problems.
*/
- static bool_t cacheInitialized;
+ static UBool cacheInitialized;
/**
* In Java, the cache stores objects of different types and
@@ -634,7 +634,7 @@ protected:
*/
virtual void handleTransliterate(Replaceable& text,
Position& index,
- bool_t incremental) const = 0;
+ UBool incremental) const = 0;
// C++ requires this friend declaration so CompoundTransliterator
// can access handleTransliterate. Alternatively, we could
@@ -917,7 +917,7 @@ private:
* Comparison function for UVector. Compares two UnicodeString
* objects given void* pointers to them.
*/
- static bool_t compareIDs(void* a, void* b);
+ static UBool compareIDs(void* a, void* b);
static void initializeCache(void);
diff --git a/icu4c/source/i18n/unicode/ucal.h b/icu4c/source/i18n/unicode/ucal.h
index 54ccc1fd339..1c0fef6c4f3 100644
--- a/icu4c/source/i18n/unicode/ucal.h
+++ b/icu4c/source/i18n/unicode/ucal.h
@@ -368,7 +368,7 @@ ucal_getTimeZoneDisplayName( const UCalendar* cal,
* @return TRUE if cal is currently in daylight savings time, FALSE otherwise
* @stable
*/
-U_CAPI bool_t
+U_CAPI UBool
ucal_inDaylightTime( const UCalendar* cal,
UErrorCode* status );
@@ -525,7 +525,7 @@ ucal_setDateTime( UCalendar* cal,
* @return TRUE if cal1 and cal2 represent the same date, FALSE otherwise.
* @stable
*/
-U_CAPI bool_t
+U_CAPI UBool
ucal_equivalentTo( const UCalendar* cal1,
const UCalendar* cal2);
@@ -627,7 +627,7 @@ ucal_set( UCalendar* cal,
* @see ucal_clear
* @stable
*/
-U_CAPI bool_t
+U_CAPI UBool
ucal_isSet( const UCalendar* cal,
UCalendarDateFields field);
diff --git a/icu4c/source/i18n/unicode/ucol.h b/icu4c/source/i18n/unicode/ucol.h
index 07d8fa676fa..3024e18f09a 100644
--- a/icu4c/source/i18n/unicode/ucol.h
+++ b/icu4c/source/i18n/unicode/ucol.h
@@ -352,7 +352,7 @@ ucol_strcoll( const UCollator *coll,
* @see ucol_equal
* @stable
*/
-U_CAPI bool_t
+U_CAPI UBool
ucol_greater( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@@ -373,7 +373,7 @@ ucol_greater( const UCollator *coll,
* @see ucol_equal
* @stable
*/
-U_CAPI bool_t
+U_CAPI UBool
ucol_greaterOrEqual( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
@@ -394,7 +394,7 @@ ucol_greaterOrEqual( const UCollator *coll,
* @see ucol_greaterOrEqual
* @stable
*/
-U_CAPI bool_t
+U_CAPI UBool
ucol_equal( const UCollator *coll,
const UChar *source,
int32_t sourceLength,
diff --git a/icu4c/source/i18n/unicode/udat.h b/icu4c/source/i18n/unicode/udat.h
index 721df7cea06..54960a3c24c 100644
--- a/icu4c/source/i18n/unicode/udat.h
+++ b/icu4c/source/i18n/unicode/udat.h
@@ -232,7 +232,7 @@ udat_parse( const UDateFormat* format,
* @see udat_setLenient
* @stable
*/
-U_CAPI bool_t
+U_CAPI UBool
udat_isLenient(const UDateFormat* fmt);
/**
@@ -246,7 +246,7 @@ udat_isLenient(const UDateFormat* fmt);
*/
U_CAPI void
udat_setLenient( UDateFormat* fmt,
- bool_t isLenient);
+ UBool isLenient);
/**
* Get the UCalendar associated with an UDateFormat.
@@ -364,7 +364,7 @@ udat_set2DigitYearStart( UDateFormat *fmt,
*/
U_CAPI int32_t
udat_toPattern( const UDateFormat *fmt,
- bool_t localized,
+ UBool localized,
UChar *result,
int32_t resultLength,
UErrorCode *status);
@@ -381,7 +381,7 @@ udat_toPattern( const UDateFormat *fmt,
*/
U_CAPI void
udat_applyPattern( UDateFormat *format,
- bool_t localized,
+ UBool localized,
const UChar *pattern,
int32_t patternLength);
diff --git a/icu4c/source/i18n/unicode/unifilt.h b/icu4c/source/i18n/unicode/unifilt.h
index ba5ca386334..a47dd085cdb 100644
--- a/icu4c/source/i18n/unicode/unifilt.h
+++ b/icu4c/source/i18n/unicode/unifilt.h
@@ -35,7 +35,7 @@ public:
* false.
* @draft
*/
- virtual bool_t contains(UChar c) const = 0;
+ virtual UBool contains(UChar c) const = 0;
/**
* Returns a copy of this object. All UnicodeFilter objects have
diff --git a/icu4c/source/i18n/unicode/uniset.h b/icu4c/source/i18n/unicode/uniset.h
index 331af12729e..682db80db89 100644
--- a/icu4c/source/i18n/unicode/uniset.h
+++ b/icu4c/source/i18n/unicode/uniset.h
@@ -373,14 +373,14 @@ public:
* @return true if the specified set is equal to this set.
* @draft
*/
- virtual bool_t operator==(const UnicodeSet& o) const;
+ virtual UBool operator==(const UnicodeSet& o) const;
/**
* Compares the specified object with this set for equality. Returns
* true if the specified set is not equal to this set.
* @draft
*/
- bool_t operator!=(const UnicodeSet& o) const;
+ UBool operator!=(const UnicodeSet& o) const;
/**
* Returns a copy of this object. All UnicodeFilter objects have
@@ -438,7 +438,7 @@ public:
* @return true if this set contains no elements.
* @draft
*/
- virtual bool_t isEmpty(void) const;
+ virtual UBool isEmpty(void) const;
/**
* Returns true if this set contains the specified range
@@ -448,7 +448,7 @@ public:
* of chars.
* @draft
*/
- virtual bool_t contains(UChar first, UChar last) const;
+ virtual UBool contains(UChar first, UChar last) const;
/**
* Returns true if this set contains the specified char.
@@ -456,7 +456,7 @@ public:
* @return true if this set contains the specified char.
* @draft
*/
- virtual bool_t contains(UChar c) const;
+ virtual UBool contains(UChar c) const;
/**
* Adds the specified range to this set if it is not already
@@ -511,7 +511,7 @@ public:
* specified set.
* @draft
*/
- virtual bool_t containsAll(const UnicodeSet& c) const;
+ virtual UBool containsAll(const UnicodeSet& c) const;
/**
* Adds all of the elements in the specified set to this set if
@@ -601,7 +601,7 @@ private:
* is the given value. This is used by RuleBasedTransliterator for
* indexing.
*/
- bool_t containsIndexValue(uint8_t v) const;
+ UBool containsIndexValue(uint8_t v) const;
private:
@@ -731,7 +731,7 @@ private:
static UChar charAfter(const UnicodeString& str, int32_t i);
};
-inline bool_t UnicodeSet::operator!=(const UnicodeSet& o) const {
+inline UBool UnicodeSet::operator!=(const UnicodeSet& o) const {
return !operator==(o);
}
diff --git a/icu4c/source/i18n/unicode/unitohex.h b/icu4c/source/i18n/unicode/unitohex.h
index 1d5062f7f1a..75d18570c3f 100644
--- a/icu4c/source/i18n/unicode/unitohex.h
+++ b/icu4c/source/i18n/unicode/unitohex.h
@@ -77,7 +77,7 @@ private:
* If TRUE, output uppercase hex digits; otherwise output
* lowercase. Set by setUppercase() and returned by isUppercase().
*/
- bool_t uppercase;
+ UBool uppercase;
public:
@@ -94,7 +94,7 @@ public:
* @stable
*/
UnicodeToHexTransliterator(const UnicodeString& pattern,
- bool_t isUppercase,
+ UBool isUppercase,
UnicodeFilter* adoptedFilter,
UErrorCode& status);
@@ -178,20 +178,20 @@ public:
* Returns true if this transliterator outputs uppercase hex digits.
* @stable
*/
- virtual bool_t isUppercase(void) const;
+ virtual UBool isUppercase(void) const;
/**
* Sets if this transliterator outputs uppercase hex digits.
* @stable
*/
- virtual void setUppercase(bool_t outputUppercase);
+ virtual void setUppercase(UBool outputUppercase);
/**
* Implements {@link Transliterator#handleTransliterate}.
* @draft
*/
virtual void handleTransliterate(Replaceable& text, Position& offsets,
- bool_t isIncremental) const;
+ UBool isIncremental) const;
};
inline UnicodeToHexTransliterator::~UnicodeToHexTransliterator() {}
diff --git a/icu4c/source/i18n/unicode/unum.h b/icu4c/source/i18n/unicode/unum.h
index 55fffb7ce7d..d39a03ccd2c 100644
--- a/icu4c/source/i18n/unicode/unum.h
+++ b/icu4c/source/i18n/unicode/unum.h
@@ -503,7 +503,7 @@ unum_setTextAttribute( UNumberFormat* fmt,
*/
U_CAPI int32_t
unum_toPattern( const UNumberFormat* fmt,
- bool_t isPatternLocalized,
+ UBool isPatternLocalized,
UChar* result,
int32_t resultLength,
UErrorCode* status);
diff --git a/icu4c/source/i18n/unifltlg.cpp b/icu4c/source/i18n/unifltlg.cpp
index 22dc7595da4..099de3327ae 100644
--- a/icu4c/source/i18n/unifltlg.cpp
+++ b/icu4c/source/i18n/unifltlg.cpp
@@ -16,12 +16,12 @@
* is equivalent to a NullFilter(TRUE).
*/
class NullFilter : public UnicodeFilter {
- bool_t result;
+ UBool result;
public:
- NullFilter(bool_t r) { result = r; }
+ NullFilter(UBool r) { result = r; }
NullFilter(const NullFilter& f) { result = f.result; }
virtual ~NullFilter() {}
- virtual bool_t contains(UChar c) const { return result; }
+ virtual UBool contains(UChar c) const { return result; }
virtual UnicodeFilter* clone() const { return new NullFilter(*this); }
};
@@ -31,14 +31,14 @@ public:
UnicodeNotFilter(UnicodeFilter* adopted);
UnicodeNotFilter(const UnicodeNotFilter&);
virtual ~UnicodeNotFilter();
- virtual bool_t contains(UChar c) const;
+ virtual UBool contains(UChar c) const;
virtual UnicodeFilter* clone() const;
};
UnicodeNotFilter::UnicodeNotFilter(UnicodeFilter* adopted) : filt(adopted) {}
UnicodeNotFilter::UnicodeNotFilter(const UnicodeNotFilter& f) : filt(f.filt->clone()) {}
UnicodeNotFilter::~UnicodeNotFilter() { delete filt; }
-bool_t UnicodeNotFilter::contains(UChar c) const { return !filt->contains(c); }
+UBool UnicodeNotFilter::contains(UChar c) const { return !filt->contains(c); }
UnicodeFilter* UnicodeNotFilter::clone() const { return new UnicodeNotFilter(*this); }
/**
@@ -60,7 +60,7 @@ public:
UnicodeAndFilter(UnicodeFilter* adopted1, UnicodeFilter* adopted2);
UnicodeAndFilter(const UnicodeAndFilter&);
virtual ~UnicodeAndFilter();
- virtual bool_t contains(UChar c) const;
+ virtual UBool contains(UChar c) const;
virtual UnicodeFilter* clone() const;
};
@@ -68,7 +68,7 @@ UnicodeAndFilter::UnicodeAndFilter(UnicodeFilter* f1, UnicodeFilter* f2) : filt1
UnicodeAndFilter::UnicodeAndFilter(const UnicodeAndFilter& f) :
filt1(f.filt1->clone()), filt2(f.filt2->clone()) {}
UnicodeAndFilter::~UnicodeAndFilter() { delete filt1; delete filt2; }
-bool_t UnicodeAndFilter::contains(UChar c) const { return filt1->contains(c) && filt2->contains(c); }
+UBool UnicodeAndFilter::contains(UChar c) const { return filt1->contains(c) && filt2->contains(c); }
UnicodeFilter* UnicodeAndFilter::clone() const { return new UnicodeAndFilter(*this); }
/**
@@ -98,7 +98,7 @@ public:
UnicodeOrFilter(UnicodeFilter* adopted1, UnicodeFilter* adopted2);
UnicodeOrFilter(const UnicodeOrFilter&);
virtual ~UnicodeOrFilter();
- virtual bool_t contains(UChar c) const;
+ virtual UBool contains(UChar c) const;
virtual UnicodeFilter* clone() const;
};
@@ -106,7 +106,7 @@ UnicodeOrFilter::UnicodeOrFilter(UnicodeFilter* f1, UnicodeFilter* f2) : filt1(f
UnicodeOrFilter::UnicodeOrFilter(const UnicodeOrFilter& f) :
filt1(f.filt1->clone()), filt2(f.filt2->clone()) {}
UnicodeOrFilter::~UnicodeOrFilter() { delete filt1; delete filt2; }
-bool_t UnicodeOrFilter::contains(UChar c) const { return filt1->contains(c) || filt2->contains(c); }
+UBool UnicodeOrFilter::contains(UChar c) const { return filt1->contains(c) || filt2->contains(c); }
UnicodeFilter* UnicodeOrFilter::clone() const { return new UnicodeOrFilter(*this); }
/**
diff --git a/icu4c/source/i18n/unirange.cpp b/icu4c/source/i18n/unirange.cpp
index 86d1976497a..432cc8968e9 100644
--- a/icu4c/source/i18n/unirange.cpp
+++ b/icu4c/source/i18n/unirange.cpp
@@ -23,7 +23,7 @@ UnicodeRange* UnicodeRange::clone() const {
/**
* CALLER OWNS RESULT.
*/
-bool_t UnicodeRange::contains(UChar c) const {
+UBool UnicodeRange::contains(UChar c) const {
return c >= start && (c - start) < length;
}
diff --git a/icu4c/source/i18n/unirange.h b/icu4c/source/i18n/unirange.h
index 910034f3fea..9545a5cd68d 100644
--- a/icu4c/source/i18n/unirange.h
+++ b/icu4c/source/i18n/unirange.h
@@ -41,7 +41,7 @@ public:
*/
UnicodeRange* clone() const;
- bool_t contains(UChar c) const;
+ UBool contains(UChar c) const;
/**
* Assume that contains(c) is true. Split this range into two new
diff --git a/icu4c/source/i18n/uniset.cpp b/icu4c/source/i18n/uniset.cpp
index 6cc14576de0..0fe2ba1f41e 100644
--- a/icu4c/source/i18n/uniset.cpp
+++ b/icu4c/source/i18n/uniset.cpp
@@ -138,7 +138,7 @@ UnicodeSet& UnicodeSet::operator=(const UnicodeSet& o) {
* @param o set to be compared for equality with this set.
* @return true if the specified set is equal to this set.
*/
-bool_t UnicodeSet::operator==(const UnicodeSet& o) const {
+UBool UnicodeSet::operator==(const UnicodeSet& o) const {
return pairs == o.pairs;
}
@@ -241,7 +241,7 @@ int32_t UnicodeSet::size(void) const {
*
* @return true if this set contains no elements.
*/
-bool_t UnicodeSet::isEmpty(void) const {
+UBool UnicodeSet::isEmpty(void) const {
return pairs.length() == 0;
}
@@ -252,7 +252,7 @@ bool_t UnicodeSet::isEmpty(void) const {
* @return true if this set contains the specified range
* of chars.
*/
-bool_t UnicodeSet::contains(UChar first, UChar last) const {
+UBool UnicodeSet::contains(UChar first, UChar last) const {
// Set i to the end of the smallest range such that its end
// point >= last, or pairs.length() if no such range exists.
int32_t i = 1;
@@ -265,7 +265,7 @@ bool_t UnicodeSet::contains(UChar first, UChar last) const {
*
* @return true if this set contains the specified char.
*/
-bool_t UnicodeSet::contains(UChar c) const {
+UBool UnicodeSet::contains(UChar c) const {
return contains(c, c);
}
@@ -274,7 +274,7 @@ bool_t UnicodeSet::contains(UChar c) const {
* is the given value. This is used by RuleBasedTransliterator for
* indexing.
*/
-bool_t UnicodeSet::containsIndexValue(uint8_t v) const {
+UBool UnicodeSet::containsIndexValue(uint8_t v) const {
/* The index value v, in the range [0,255], is contained in this set if
* it is contained in any pair of this set. Pairs either have the high
* bytes equal, or unequal. If the high bytes are equal, then we have
@@ -357,7 +357,7 @@ void UnicodeSet::remove(UChar c) {
* @return true if this set contains all of the elements of the
* specified set.
*/
-bool_t UnicodeSet::containsAll(const UnicodeSet& c) const {
+UBool UnicodeSet::containsAll(const UnicodeSet& c) const {
// The specified set is a subset if all of its pairs are contained
// in this set.
int32_t i = 1;
@@ -468,7 +468,7 @@ UnicodeString& UnicodeSet::parse(UnicodeString& pairsBuf /*result*/,
return pairsBuf;
}
- bool_t invert = FALSE;
+ UBool invert = FALSE;
pairsBuf.remove();
int32_t lastChar = -1; // This is either a char (0..FFFF) or -1
@@ -510,7 +510,7 @@ UnicodeString& UnicodeSet::parse(UnicodeString& pairsBuf /*result*/,
*/
UChar c = pattern.charAt(i);
nestedPairs = NULL;
- bool_t isLiteral = FALSE;
+ UBool isLiteral = FALSE;
// Ignore whitespace. This is not Unicode whitespace, but Java
// whitespace, a subset of Unicode whitespace.
@@ -823,7 +823,7 @@ void UnicodeSet::removePair(UnicodeString& pairs, UChar c, UChar d) {
// Once we get here, we know c <= b and d >= a.
// rangeEdited is set to true if we have modified the
// range a-b (the range at i) in place.
- bool_t rangeEdited = FALSE;
+ UBool rangeEdited = FALSE;
if (c > a) {
// If c is after a and before b, then we have overlap
// of this sort: a--c==b--d or a--c==d--b, where a-b
@@ -1080,7 +1080,7 @@ UnicodeString& UnicodeSet::getCategoryPairs(UnicodeString& result,
// The temporary cat is only really needed if invert is true.
// TO DO: Allocate cat on the heap only if needed.
UnicodeString cat(catName);
- bool_t invert = (catName.length() > 1 &&
+ UBool invert = (catName.length() > 1 &&
catName.charAt(0) == COMPLEMENT);
if (invert) {
cat.remove(0, 1);
diff --git a/icu4c/source/i18n/unitohex.cpp b/icu4c/source/i18n/unitohex.cpp
index 839e5d421c1..ab5ab698871 100644
--- a/icu4c/source/i18n/unitohex.cpp
+++ b/icu4c/source/i18n/unitohex.cpp
@@ -29,7 +29,7 @@ const UChar UnicodeToHexTransliterator::HEX_DIGITS[32] = {
*/
UnicodeToHexTransliterator::UnicodeToHexTransliterator(
const UnicodeString& thePattern,
- bool_t isUppercase,
+ UBool isUppercase,
UnicodeFilter* adoptedFilter,
UErrorCode& status) :
Transliterator(_ID, adoptedFilter),
@@ -129,7 +129,7 @@ void UnicodeToHexTransliterator::applyPattern(const UnicodeString& thePattern,
for (int32_t i=0; i "U+0040",
@@ -240,7 +240,7 @@ void UnicodeToHexTransliterator::handleTransliterate(Replaceable& text, Position
}
hex = prefix;
- bool_t showRest = FALSE;
+ UBool showRest = FALSE;
for (int32_t i=3; i>=0; --i) {
int32_t d = (c >> (i*4)) & 0xF;
if (showRest || (d != 0) || minDigits > i) {
diff --git a/icu4c/source/i18n/unum.cpp b/icu4c/source/i18n/unum.cpp
index 1b9c4897ce7..e867c4927ef 100644
--- a/icu4c/source/i18n/unum.cpp
+++ b/icu4c/source/i18n/unum.cpp
@@ -327,15 +327,15 @@ unum_setAttribute( UNumberFormat* fmt,
{
switch(attr) {
case UNUM_PARSE_INT_ONLY:
- ((NumberFormat*)fmt)->setParseIntegerOnly((bool_t)newValue);
+ ((NumberFormat*)fmt)->setParseIntegerOnly((UBool)newValue);
break;
case UNUM_GROUPING_USED:
- ((NumberFormat*)fmt)->setGroupingUsed((bool_t)newValue);
+ ((NumberFormat*)fmt)->setGroupingUsed((UBool)newValue);
break;
case UNUM_DECIMAL_ALWAYS_SHOWN:
- ((DecimalFormat*)fmt)->setDecimalSeparatorAlwaysShown((bool_t)newValue);
+ ((DecimalFormat*)fmt)->setDecimalSeparatorAlwaysShown((UBool)newValue);
break;
case UNUM_MAX_INTEGER_DIGITS:
@@ -499,7 +499,7 @@ unum_setTextAttribute( UNumberFormat* fmt,
U_CAPI int32_t
unum_toPattern( const UNumberFormat* fmt,
- bool_t isPatternLocalized,
+ UBool isPatternLocalized,
UChar* result,
int32_t resultLength,
UErrorCode* status)
diff --git a/icu4c/source/i18n/wdbkdat.cpp b/icu4c/source/i18n/wdbkdat.cpp
index f42b504d17d..97e3ebc81b7 100644
--- a/icu4c/source/i18n/wdbkdat.cpp
+++ b/icu4c/source/i18n/wdbkdat.cpp
@@ -307,7 +307,7 @@ SpecialMapping TextBoundaryData::kWordExceptionChar[] = {
SpecialMapping(TextBoundaryData::END_OF_STRING, TextBoundaryData::kwEOS)
};
-const bool_t TextBoundaryData::kWordExceptionFlags[] = {
+const UBool TextBoundaryData::kWordExceptionFlags[] = {
FALSE, // kNonCharacter = 0,
FALSE, // kUppercaseLetter = 1,
FALSE, // kLowercaseLetter = 2,
diff --git a/icu4c/source/i18n/wdbktbl.h b/icu4c/source/i18n/wdbktbl.h
index c56fddfad54..9541c4c9747 100644
--- a/icu4c/source/i18n/wdbktbl.h
+++ b/icu4c/source/i18n/wdbktbl.h
@@ -62,14 +62,14 @@ public:
* @param state the state as returned by get, initialState, or endState
* @return true if transition into state was marked.
*/
- bool_t isMarkState(Node state) const;
+ UBool isMarkState(Node state) const;
/**
* Check to see if the state is the end state
* @param state the state to check
* @return true if state is an end state
*/
- bool_t isEndState(Node state) const;
+ UBool isEndState(Node state) const;
/**
* Get the initial state
@@ -97,13 +97,13 @@ WordBreakTable::get(WordBreakTable::Node oldState, WordBreakTable::Type input) c
return fData[(oldState & kIndex_mask) * fCols + input];
}
-inline bool_t
+inline UBool
WordBreakTable::isMarkState(WordBreakTable::Node state) const
{
return (state & kMark_mask) != 0;
}
-inline bool_t
+inline UBool
WordBreakTable::isEndState(WordBreakTable::Node state) const
{
return (state & kIndex_mask) == kEnd_state;
diff --git a/icu4c/source/samples/XMLConverter/XMLConverter.cpp b/icu4c/source/samples/XMLConverter/XMLConverter.cpp
index e8a8d51844e..f32ce8a1039 100644
--- a/icu4c/source/samples/XMLConverter/XMLConverter.cpp
+++ b/icu4c/source/samples/XMLConverter/XMLConverter.cpp
@@ -65,7 +65,7 @@ extern int32_t XMLUConvert( UConverter* inConverter,
int32_t* inBufSize,
char* outBuffer,
int32_t outBufCapacity,
- bool_t flush,
+ UBool flush,
UErrorCode* err);
extern void XMLU_fromCodepageToCodepage( UConverter* outConverter,
UConverter* inConverter,
@@ -74,7 +74,7 @@ extern void XMLU_fromCodepageToCodepage( UConverter* outConverter,
const char** source,
const char* sourceLimit,
int32_t* offsets,
- bool_t flush,
+ UBool flush,
UErrorCode* err);
static const BYTE gEBCDICPre[] = { 0x4C, 0x6F, 0xA7, 0x94 };
@@ -899,7 +899,7 @@ int32_t XMLUConvert( UConverter* inConverter,
int32_t* inBufSize,
char* outBuffer,
int32_t outBufCapacity,
- bool_t flush,
+ UBool flush,
UErrorCode* err)
{
const char* inBufferAlias = inBuffer;
@@ -933,7 +933,7 @@ void XMLU_fromCodepageToCodepage( UConverter* outConverter,
const char** source,
const char* sourceLimit,
int32_t* offsets,
- bool_t flush,
+ UBool flush,
UErrorCode* err)
{
diff --git a/icu4c/source/samples/cal/cal.c b/icu4c/source/samples/cal/cal.c
index 7fe961079a2..44e9bde9f77 100644
--- a/icu4c/source/samples/cal/cal.c
+++ b/icu4c/source/samples/cal/cal.c
@@ -28,20 +28,20 @@
static void usage();
static void version();
static void cal(int32_t month, int32_t year,
- bool_t useLongNames, UErrorCode *status);
-static void get_days(const UChar *days [], bool_t useLongNames,
+ UBool useLongNames, UErrorCode *status);
+static void get_days(const UChar *days [], UBool useLongNames,
int32_t fdow, UErrorCode *status);
-static void get_months(const UChar *months [], bool_t useLongNames,
+static void get_months(const UChar *months [], UBool useLongNames,
UErrorCode *status);
static void indent(int32_t count, FILE *f);
static void print_days(const UChar *days [], FILE *f, UErrorCode *status);
static void print_month(UCalendar *c,
const UChar *days [],
- bool_t useLongNames, int32_t fdow,
+ UBool useLongNames, int32_t fdow,
UErrorCode *status);
static void print_year(UCalendar *c,
const UChar *days [], const UChar *months [],
- bool_t useLongNames, int32_t fdow,
+ UBool useLongNames, int32_t fdow,
UErrorCode *status);
/* The version of cal */
@@ -187,7 +187,7 @@ version()
static void
cal(int32_t month,
int32_t year,
- bool_t useLongNames,
+ UBool useLongNames,
UErrorCode *status)
{
UCalendar *c;
@@ -250,7 +250,7 @@ cal(int32_t month,
weeks start on Monday) */
static void
get_days(const UChar *days [],
- bool_t useLongNames,
+ UBool useLongNames,
int32_t fdow,
UErrorCode *status)
{
@@ -278,7 +278,7 @@ get_days(const UChar *days [],
short form. */
static void
get_months(const UChar *months [],
- bool_t useLongNames,
+ UBool useLongNames,
UErrorCode *status)
{
UResourceBundle *bundle;
@@ -337,7 +337,7 @@ print_days(const UChar *days [],
static void
print_month(UCalendar *c,
const UChar *days [],
- bool_t useLongNames,
+ UBool useLongNames,
int32_t fdow,
UErrorCode *status)
{
@@ -447,7 +447,7 @@ static void
print_year(UCalendar *c,
const UChar *days [],
const UChar *months [],
- bool_t useLongNames,
+ UBool useLongNames,
int32_t fdow,
UErrorCode *status)
{
diff --git a/icu4c/source/test/cintltst/cbiditst.c b/icu4c/source/test/cintltst/cbiditst.c
index e9fea4e7453..429172b3068 100644
--- a/icu4c/source/test/cintltst/cbiditst.c
+++ b/icu4c/source/test/cintltst/cbiditst.c
@@ -207,7 +207,7 @@ testReordering(UBiDi *pBiDi, int testNumber) {
UTextOffset i, length=ubidi_getLength(pBiDi);
UTextOffset runCount, visualIndex, logicalStart, runLength;
int result=0;
- bool_t odd;
+ UBool odd;
if(length<=0) {
return;
diff --git a/icu4c/source/test/cintltst/cdtrgtst.c b/icu4c/source/test/cintltst/cdtrgtst.c
index 8d0f77e45cf..5ab30165d6a 100644
--- a/icu4c/source/test/cintltst/cdtrgtst.c
+++ b/icu4c/source/test/cintltst/cdtrgtst.c
@@ -298,7 +298,7 @@ void Test4060212()
*/
void Test4061287()
{
- bool_t ok;
+ UBool ok;
int32_t pos;
UDateFormat *df;
UErrorCode status = U_ZERO_ERROR;
diff --git a/icu4c/source/test/cintltst/chashtst.c b/icu4c/source/test/cintltst/chashtst.c
index ef85f9f9307..aefda34dcb2 100644
--- a/icu4c/source/test/cintltst/chashtst.c
+++ b/icu4c/source/test/cintltst/chashtst.c
@@ -21,7 +21,7 @@ void TestBasic(void);
int32_t hashChars(const void* key);
-bool_t isEqualChars(const void* key1, const void* key2);
+UBool isEqualChars(const void* key1, const void* key2);
static void _put(UHashtable* hash,
const char* key,
@@ -95,7 +95,7 @@ int32_t hashChars(const void* key) {
return *(const char*) key;
}
-bool_t isEqualChars(const void* key1, const void* key2) {
+UBool isEqualChars(const void* key1, const void* key2) {
return (key1 != NULL) &&
(key2 != NULL) &&
(uprv_strcmp(key1, key2) == 0);
diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c
index e5d50a7e235..c637e7f3626 100644
--- a/icu4c/source/test/cintltst/cloctst.c
+++ b/icu4c/source/test/cintltst/cloctst.c
@@ -556,7 +556,7 @@ void TestISOFunctions()
int32_t count = 0;
- bool_t done = FALSE;
+ UBool done = FALSE;
const char* const* str=uloc_getISOLanguages();
const char* const* str1=uloc_getISOCountries();
diff --git a/icu4c/source/test/cintltst/cmsgtst.c b/icu4c/source/test/cintltst/cmsgtst.c
index 6804ccc0b4d..4354b8a8290 100644
--- a/icu4c/source/test/cintltst/cmsgtst.c
+++ b/icu4c/source/test/cintltst/cmsgtst.c
@@ -47,7 +47,7 @@ static UChar* testCasePatterns[5];
static UChar* testResultStrings[5];
-static bool_t strings_initialized = FALSE;
+static UBool strings_initialized = FALSE;
/* function used to create the test patterns for testing Message formatting */
static void InitStrings( void )
{
diff --git a/icu4c/source/test/cintltst/cregrtst.c b/icu4c/source/test/cintltst/cregrtst.c
index 1fee4b241bd..39bdb175294 100644
--- a/icu4c/source/test/cintltst/cregrtst.c
+++ b/icu4c/source/test/cintltst/cregrtst.c
@@ -962,7 +962,7 @@ void TestLineInvariants()
UBreakIterator *e;
UErrorCode status = U_ZERO_ERROR;
UChar noBreak[10], dashes[10];
- bool_t saw2;
+ UBool saw2;
UChar work[5];
UChar *s;
AllocateTextBoundary();
@@ -1312,7 +1312,7 @@ void doFirstSelectionTest(UBreakIterator* iterator, UChar* testText, Vector* res
int32_t selectionStart, selectionEnd;
UChar* expectedFirstSelection;
UChar* tempFirst;
- bool_t success = TRUE;
+ UBool success = TRUE;
log_verbose("doFirstSelectionTest.......\n");
@@ -1349,7 +1349,7 @@ void doLastSelectionTest(UBreakIterator* iterator, UChar* testText, Vector* resu
int32_t selectionEnd, selectionStart;
UChar *expectedLastSelection;
UChar *tempLast;
- bool_t success = TRUE;
+ UBool success = TRUE;
log_verbose("doLastSelectionTest.......\n");
@@ -1478,7 +1478,7 @@ void doBreakInvariantTest(UBreakIteratorType type, UChar* testChars)
UChar work[3];
UChar breaks[10];
UChar c;
- bool_t seen2;
+ UBool seen2;
int errorCount = 0;
status=U_ZERO_ERROR;
diff --git a/icu4c/source/test/cintltst/crestst.c b/icu4c/source/test/cintltst/crestst.c
index 7801f3d62a6..f166e786e60 100644
--- a/icu4c/source/test/cintltst/crestst.c
+++ b/icu4c/source/test/cintltst/crestst.c
@@ -94,8 +94,8 @@ static struct
const char* name;
UErrorCode expected_constructor_status;
E_Where where;
- bool_t like[e_Where_count];
- bool_t inherits[e_Where_count];
+ UBool like[e_Where_count];
+ UBool inherits[e_Where_count];
}
param[] =
{
@@ -284,16 +284,16 @@ void TestConstruction2()
/*****************************************************************************/
/*****************************************************************************/
-bool_t testTag(const char* frag,
- bool_t in_Root,
- bool_t in_te,
- bool_t in_te_IN)
+UBool testTag(const char* frag,
+ UBool in_Root,
+ UBool in_te,
+ UBool in_te_IN)
{
- bool_t pass=TRUE;
+ UBool pass=TRUE;
/* Make array from input params */
- bool_t is_in[3];
+ UBool is_in[3];
const char *NAME[] = { "ROOT", "TE", "TE_IN" };
/* Now try to load the desired items */
diff --git a/icu4c/source/test/cintltst/crestst.h b/icu4c/source/test/cintltst/crestst.h
index c2e5fbd0577..c827f3341e5 100644
--- a/icu4c/source/test/cintltst/crestst.h
+++ b/icu4c/source/test/cintltst/crestst.h
@@ -39,7 +39,7 @@
**/
void setUpDataTable(void);
- bool_t testTag(const char* frag, bool_t in_Root, bool_t in_te, bool_t in_te_IN);
+ UBool testTag(const char* frag, UBool in_Root, UBool in_te, UBool in_te_IN);
void record_pass(void);
void record_fail(void);
diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c
index 588c30d798b..697df8b1310 100644
--- a/icu4c/source/test/cintltst/creststn.c
+++ b/icu4c/source/test/cintltst/creststn.c
@@ -40,7 +40,7 @@ randul()
{
uint32_t l;
int32_t i;
- static bool_t initialized = FALSE;
+ static UBool initialized = FALSE;
if (!initialized)
{
srand((unsigned)time(NULL));
@@ -131,8 +131,8 @@ static struct
const char* name;
UErrorCode expected_constructor_status;
E_Where where;
- bool_t like[e_Where_count];
- bool_t inherits[e_Where_count];
+ UBool like[e_Where_count];
+ UBool inherits[e_Where_count];
}
param[] =
{
@@ -315,16 +315,16 @@ void TestConstruction2()
/*****************************************************************************/
/*****************************************************************************/
-bool_t testTag(const char* frag,
- bool_t in_Root,
- bool_t in_te,
- bool_t in_te_IN)
+UBool testTag(const char* frag,
+ UBool in_Root,
+ UBool in_te,
+ UBool in_te_IN)
{
- bool_t pass=TRUE;
+ UBool pass=TRUE;
/* Make array from input params */
- bool_t is_in[3];
+ UBool is_in[3];
const char *NAME[] = { "ROOT", "TE", "TE_IN" };
/* Now try to load the desired items */
diff --git a/icu4c/source/test/cintltst/creststn.h b/icu4c/source/test/cintltst/creststn.h
index 932e7473876..7a1576af2ab 100644
--- a/icu4c/source/test/cintltst/creststn.h
+++ b/icu4c/source/test/cintltst/creststn.h
@@ -41,7 +41,7 @@
**/
- static bool_t testTag(const char* frag, bool_t in_Root, bool_t in_te, bool_t in_te_IN);
+ static UBool testTag(const char* frag, UBool in_Root, UBool in_te, UBool in_te_IN);
static void record_pass(void);
static void record_fail(void);
diff --git a/icu4c/source/test/cintltst/eurocreg.c b/icu4c/source/test/cintltst/eurocreg.c
index 2db35e7f712..89a1435fc59 100644
--- a/icu4c/source/test/cintltst/eurocreg.c
+++ b/icu4c/source/test/cintltst/eurocreg.c
@@ -80,7 +80,7 @@ char convertersToCheck[][15] = {
"cp28709",
""};
-bool_t isEuroAware(const UConverter*);
+UBool isEuroAware(const UConverter*);
void TestEuroRegression()
{
@@ -100,7 +100,7 @@ void TestEuroRegression()
} while (convertersToCheck[++i][0]);
}
-bool_t isEuroAware(const UConverter* myConv)
+UBool isEuroAware(const UConverter* myConv)
{
static const UChar euroString[2] = { 0x20AC, 0x0000 };
char target[2];
diff --git a/icu4c/source/test/cintltst/nccbtst.c b/icu4c/source/test/cintltst/nccbtst.c
index d438753f36d..4431d09ee18 100644
--- a/icu4c/source/test/cintltst/nccbtst.c
+++ b/icu4c/source/test/cintltst/nccbtst.c
@@ -345,7 +345,7 @@ void TestSingleByte(int32_t inputsize, int32_t outputsize)
log_err("ibm-943->u with subst did not match.\n");
}
-bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *expect, int expectLen,
+UBool testConvertFromUnicode(const UChar *source, int sourceLen, const char *expect, int expectLen,
const char *codepage, UConverterFromUCallback callback , int32_t *expectOffsets)
{
@@ -363,8 +363,8 @@ bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *e
char *realBufferEnd;
const UChar *realSourceEnd;
const UChar *sourceLimit;
- bool_t checkOffsets = TRUE;
- bool_t doFlush;
+ UBool checkOffsets = TRUE;
+ UBool doFlush;
UConverterFromUCallback action;
char junk[9999];
char offset_str[9999];
@@ -511,7 +511,7 @@ bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *e
}
}
-bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *expect, int expectlen,
+UBool testConvertToUnicode( const char *source, int sourcelen, const UChar *expect, int expectlen,
const char *codepage, UConverterToUCallback callback, int32_t *expectOffsets)
{
UErrorCode status = U_ZERO_ERROR;
@@ -525,7 +525,7 @@ bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *exp
UChar *end;
int32_t *offs;
int i;
- bool_t checkOffsets = TRUE;
+ UBool checkOffsets = TRUE;
char junk[9999];
char offset_str[9999];
UChar *p;
@@ -600,7 +600,7 @@ bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *exp
&src,
srcLimit,
checkOffsets ? offs : NULL,
- (bool_t)(srcLimit == realSourceEnd), /* flush if we're at the end of hte source data */
+ (UBool)(srcLimit == realSourceEnd), /* flush if we're at the end of hte source data */
&status);
diff --git a/icu4c/source/test/cintltst/nccbtst.h b/icu4c/source/test/cintltst/nccbtst.h
index ddc12a90e1b..6881fc2b59d 100644
--- a/icu4c/source/test/cintltst/nccbtst.h
+++ b/icu4c/source/test/cintltst/nccbtst.h
@@ -34,11 +34,11 @@ static void TestSubWithValue(int32_t inputsize, int32_t outputsize);
static void TestLegalAndOthers(int32_t inputsize, int32_t outputsize);
static void TestSingleByte(int32_t inputsize, int32_t outputsize);
-bool_t testConvertFromUnicode(const UChar *source, int sourceLen, const char *expect, int expectLen,
+UBool testConvertFromUnicode(const UChar *source, int sourceLen, const char *expect, int expectLen,
const char *codepage, UConverterFromUCallback callback, int32_t *expectOffsets);
-bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *expect, int expectlen,
+UBool testConvertToUnicode( const char *source, int sourcelen, const UChar *expect, int expectlen,
const char *codepage, UConverterToUCallback callback, int32_t *expectOffsets);
diff --git a/icu4c/source/test/cintltst/nucnvtst.c b/icu4c/source/test/cintltst/nucnvtst.c
index c1a2128786c..31e624cd40c 100644
--- a/icu4c/source/test/cintltst/nucnvtst.c
+++ b/icu4c/source/test/cintltst/nucnvtst.c
@@ -127,7 +127,7 @@ void setNuConvTestName(const char *codepage, const char *direction)
gOutBufferSize);
}
-bool_t testConvertFromU( const UChar *source, int sourceLen, const char *expect, int expectLen,
+UBool testConvertFromU( const UChar *source, int sourceLen, const char *expect, int expectLen,
const char *codepage, int32_t *expectOffsets)
{
UErrorCode status = U_ZERO_ERROR;
@@ -143,8 +143,8 @@ bool_t testConvertFromU( const UChar *source, int sourceLen, const char *expect
char *realBufferEnd;
const UChar *realSourceEnd;
const UChar *sourceLimit;
- bool_t checkOffsets = TRUE;
- bool_t doFlush;
+ UBool checkOffsets = TRUE;
+ UBool doFlush;
for(i=0;i
#include
-void CalendarLimitTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CalendarLimitTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite TestCalendarLimit");
switch (index) {
@@ -74,7 +74,7 @@ CalendarLimitTest::previousDouble(double a)
return uprv_nextDouble(a, FALSE);
}
-bool_t
+UBool
CalendarLimitTest::withinErr(double a, double b, double err)
{
return ( uprv_fabs(a - b) < uprv_fabs(a * err) );
@@ -288,7 +288,7 @@ const int32_t CalendarLimitTest::kMonthLength[]
const int32_t CalendarLimitTest::kLeapMonthLength[]
= {31,29,31,30,31,30,31,31,30,31,30,31}; // 0-based
-bool_t
+UBool
CalendarLimitTest::timeToFields(UDate theTime, int32_t* fields)
{
if(uprv_isInfinite(theTime))
@@ -296,7 +296,7 @@ CalendarLimitTest::timeToFields(UDate theTime, int32_t* fields)
int32_t rawYear;
int32_t year, month, date, dayOfWeek, dayOfYear, era;
- bool_t isLeap;
+ UBool isLeap;
// Compute the year, month, and day of month from the given millis
// {sfb} for simplicity's sake, assume no one will change the cutover date
@@ -380,14 +380,14 @@ CalendarLimitTest::timeToFields(UDate theTime, int32_t* fields)
fields[MONTH] = month;
fields[DATE] = date;
// month: 0 <= m <= 11
- bool_t monthLegal = ( (month - Calendar::JANUARY) >= 0 &&
+ UBool monthLegal = ( (month - Calendar::JANUARY) >= 0 &&
(month - Calendar::JANUARY) <= 11 );
- bool_t dateLegal = ( date >= 1 &&
+ UBool dateLegal = ( date >= 1 &&
date <= (isLeap ? kLeapMonthLength[month - Calendar::JANUARY]
: kMonthLength[month - Calendar::JANUARY]));
- bool_t yearLegal = (year >= 0);
+ UBool yearLegal = (year >= 0);
return monthLegal && dateLegal && yearLegal;
}
diff --git a/icu4c/source/test/intltest/callimts.h b/icu4c/source/test/intltest/callimts.h
index 58db2249665..5244b2e34d8 100644
--- a/icu4c/source/test/intltest/callimts.h
+++ b/icu4c/source/test/intltest/callimts.h
@@ -20,7 +20,7 @@ class DateFormat;
*/
class CalendarLimitTest: public CalendarTimeZoneTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public: // package
static const UDate EARLIEST_SUPPORTED_MILLIS;
static const UDate LATEST_SUPPORTED_MILLIS;
@@ -30,7 +30,7 @@ public: // package
static double nextDouble(double a);
static double previousDouble(double a);
- static bool_t withinErr(double a, double b, double err);
+ static UBool withinErr(double a, double b, double err);
public:
// test behaviour and error reporting at boundaries of defined range
@@ -66,7 +66,7 @@ public: // package
static int32_t MONTH;
static int32_t DATE;
- static bool_t timeToFields(UDate millis, int32_t *fields);
+ static UBool timeToFields(UDate millis, int32_t *fields);
};
#endif // __CalendarLimitTest__
diff --git a/icu4c/source/test/intltest/calregts.cpp b/icu4c/source/test/intltest/calregts.cpp
index 0ecea8ea2c8..a98b987bdf2 100644
--- a/icu4c/source/test/intltest/calregts.cpp
+++ b/icu4c/source/test/intltest/calregts.cpp
@@ -25,7 +25,7 @@ const UDate CalendarRegressionTest::LATEST_SUPPORTED_MILLIS = 4503599627370
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
void
-CalendarRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+CalendarRegressionTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite NumberFormatRegressionTest");
switch (index) {
@@ -94,7 +94,7 @@ const char* CalendarRegressionTest::FIELD_NAME [] = {
"DOW_LOCAL"
};
-bool_t
+UBool
CalendarRegressionTest::failure(UErrorCode status, const char* msg)
{
if(U_FAILURE(status)) {
@@ -185,7 +185,7 @@ CalendarRegressionTest::test4031502()
UErrorCode status = U_ZERO_ERROR;
int32_t count = 0;
const UnicodeString **ids = TimeZone::createAvailableIDs(count);
- bool_t bad = FALSE;
+ UBool bad = FALSE;
for (int32_t i=0; iclear();
sdf.adoptCalendar(testCal);
sdf.applyPattern("EEE dd MMM yyyy 'WOY'ww'-'YYYY 'DOY'DDD");
- bool_t fail = FALSE;
+ UBool fail = FALSE;
for (int32_t firstDay=1; firstDay<=2; firstDay++) {
for (int32_t minDays=1; minDays<=7; minDays++) {
testCal->setMinimalDaysInFirstWeek((uint8_t)minDays);
@@ -927,7 +927,7 @@ CalendarRegressionTest::test4031502()
};
- bool_t ADDROLL_bool [] = {
+ UBool ADDROLL_bool [] = {
TRUE,//ADD,
TRUE,
FALSE,
@@ -1069,7 +1069,7 @@ CalendarRegressionTest::test4031502()
UDate onset = makeDate(1998, Calendar::APRIL, 5, 1, 0) + ONE_HOUR;
UDate cease = makeDate(1998, Calendar::OCTOBER, 25, 0, 0) + 2*ONE_HOUR;
- bool_t fail = FALSE;
+ UBool fail = FALSE;
const int32_t ADD = 1;
const int32_t ROLL = 2;
@@ -1378,7 +1378,7 @@ CalendarRegressionTest::Test4149677()
errln("setGregorianChange failed");
// to obtain a pure Julian calendar
- bool_t is100Leap = calendar->isLeapYear(100);
+ UBool is100Leap = calendar->isLeapYear(100);
if (!is100Leap) {
UnicodeString temp;
errln("test failed with zone " + zones[i]->getID(temp));
@@ -1502,7 +1502,7 @@ CalendarRegressionTest::Test4166109()
* 22 23 24 25 26 27 28
* 29 30 31
*/
- bool_t passed = TRUE;
+ UBool passed = TRUE;
UErrorCode status = U_ZERO_ERROR;
Calendar::EDateFields field = Calendar::WEEK_OF_MONTH;
@@ -1598,7 +1598,7 @@ CalendarRegressionTest::Test4167060()
int32_t years[] = {2000, maxYear-1, maxYear, maxYear+1};
for (int32_t i = 0; i < 4; i++) {
- bool_t valid = years[i] <= maxYear;
+ UBool valid = years[i] <= maxYear;
calendar->set(field, years[i]);
UDate dateAfter = calendar->getTime(status);
if(U_FAILURE(status))
diff --git a/icu4c/source/test/intltest/calregts.h b/icu4c/source/test/intltest/calregts.h
index 8308e97c0ac..31e87c98ce8 100644
--- a/icu4c/source/test/intltest/calregts.h
+++ b/icu4c/source/test/intltest/calregts.h
@@ -20,7 +20,7 @@ class GregorianCalendar;
class CalendarRegressionTest: public IntlTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
void test4100311(void);
void test4074758(void);
@@ -64,7 +64,7 @@ public:
void TestJ81(void);
void printdate(GregorianCalendar *cal, char *string);
- void dowTest(bool_t lenient) ;
+ void dowTest(UBool lenient) ;
static UDate getAssociatedDate(UDate d, UErrorCode& status);
@@ -75,7 +75,7 @@ public:
static const char* FIELD_NAME[];
protected:
- bool_t failure(UErrorCode status, const char* msg);
+ UBool failure(UErrorCode status, const char* msg);
};
diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp
index d4ef6f275a0..24afd301bc0 100644
--- a/icu4c/source/test/intltest/caltest.cpp
+++ b/icu4c/source/test/intltest/caltest.cpp
@@ -15,7 +15,7 @@
// class CalendarTest
// *****************************************************************************
-void CalendarTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CalendarTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite TestCalendar");
switch (index) {
@@ -191,7 +191,7 @@ CalendarTest::TestGenericAPI()
cal->after(*cal2, status) ||
U_FAILURE(status)) errln("FAIL: equals/before/after failed");
- cal->roll(Calendar::SECOND, (bool_t) TRUE, status);
+ cal->roll(Calendar::SECOND, (UBool) TRUE, status);
if (failure(status, "Calendar::roll")) return;
if (!cal->equals(*cal2, status) ||
cal->before(*cal2, status) ||
@@ -214,7 +214,7 @@ CalendarTest::TestGenericAPI()
int32_t i;
for (i=0; i<2; ++i)
{
- bool_t lenient = ( i > 0 );
+ UBool lenient = ( i > 0 );
cal->setLenient(lenient);
if (lenient != cal->isLenient()) errln("FAIL: setLenient/isLenient failed");
// Later: Check for lenient behavior
@@ -378,7 +378,7 @@ CalendarTest::TestDOW943()
dowTest(TRUE);
}
-void CalendarTest::dowTest(bool_t lenient)
+void CalendarTest::dowTest(UBool lenient)
{
UErrorCode status = U_ZERO_ERROR;
GregorianCalendar* cal = new GregorianCalendar(status);
@@ -431,7 +431,7 @@ CalendarTest::TestClonesUnique908()
void
CalendarTest::TestGregorianChange768()
{
- bool_t b;
+ UBool b;
UErrorCode status = U_ZERO_ERROR;
UnicodeString str;
GregorianCalendar* c = new GregorianCalendar(status);
@@ -912,7 +912,7 @@ void
CalendarTest::TestSerialize337()
{
Calendar cal = Calendar::getInstance();
- bool_t ok = FALSE;
+ UBool ok = FALSE;
try {
FileOutputStream f = new FileOutputStream(FILENAME);
ObjectOutput s = new ObjectOutputStream(f);
@@ -1098,7 +1098,7 @@ CalendarTest::TestEpochStartFields()
gc->setTimeZone(*z);
gc->setTime(d, status);
if (U_FAILURE(status)) { errln("Calendar::setTime failed"); return; }
- bool_t idt = gc->inDaylightTime(status);
+ UBool idt = gc->inDaylightTime(status);
if (U_FAILURE(status)) { errln("GregorianCalendar::inDaylightTime failed"); return; }
if (idt) {
UnicodeString str;
diff --git a/icu4c/source/test/intltest/caltest.h b/icu4c/source/test/intltest/caltest.h
index cbd0f33f58a..016fadb0671 100644
--- a/icu4c/source/test/intltest/caltest.h
+++ b/icu4c/source/test/intltest/caltest.h
@@ -14,7 +14,7 @@
class CalendarTest: public CalendarTimeZoneTest {
public:
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
/**
* This test confirms the correct behavior of add when incrementing
@@ -29,7 +29,7 @@ public:
/**
* test subroutine use by TestDOW943
*/
- void dowTest(bool_t lenient);
+ void dowTest(UBool lenient);
/**
* Confirm that cloned Calendar objects do not inadvertently share substructures.
*/
diff --git a/icu4c/source/test/intltest/caltztst.cpp b/icu4c/source/test/intltest/caltztst.cpp
index bc5869c3ef7..70b58e33d85 100644
--- a/icu4c/source/test/intltest/caltztst.cpp
+++ b/icu4c/source/test/intltest/caltztst.cpp
@@ -20,7 +20,7 @@
DateFormat* CalendarTimeZoneTest::fgDateFormat = 0;
Calendar* CalendarTimeZoneTest::fgCalendar = 0;
-bool_t CalendarTimeZoneTest::failure(UErrorCode status, const char* msg)
+UBool CalendarTimeZoneTest::failure(UErrorCode status, const char* msg)
{
if (U_FAILURE(status))
{
diff --git a/icu4c/source/test/intltest/caltztst.h b/icu4c/source/test/intltest/caltztst.h
index f720ec32b7c..ac825acd5c7 100644
--- a/icu4c/source/test/intltest/caltztst.h
+++ b/icu4c/source/test/intltest/caltztst.h
@@ -23,7 +23,7 @@ class CalendarTimeZoneTest : public IntlTest
protected:
// Return true if the given status indicates failure. Also has the side effect
// of calling errln(). Msg should be of the form "Class::Method" in general.
- bool_t failure(UErrorCode status, const char* msg);
+ UBool failure(UErrorCode status, const char* msg);
// Utility method for formatting dates for printing; useful for Java->C++ conversion.
// Tries to mimic the Java Date.toString() format.
diff --git a/icu4c/source/test/intltest/citrtest.cpp b/icu4c/source/test/intltest/citrtest.cpp
index 9bf56d5f804..8792840d4a1 100644
--- a/icu4c/source/test/intltest/citrtest.cpp
+++ b/icu4c/source/test/intltest/citrtest.cpp
@@ -14,7 +14,7 @@ CharIterTest::~CharIterTest()
{
}
-void CharIterTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CharIterTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite LocaleTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/citrtest.h b/icu4c/source/test/intltest/citrtest.h
index dd670bf3890..c20fcde3dd7 100644
--- a/icu4c/source/test/intltest/citrtest.h
+++ b/icu4c/source/test/intltest/citrtest.h
@@ -14,7 +14,7 @@ public:
CharIterTest();
~CharIterTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* Test Constructors and operators ==, != and a few other methods
diff --git a/icu4c/source/test/intltest/cpdtrtst.cpp b/icu4c/source/test/intltest/cpdtrtst.cpp
index 5ddbb28b026..27bfbb6da0b 100644
--- a/icu4c/source/test/intltest/cpdtrtst.cpp
+++ b/icu4c/source/test/intltest/cpdtrtst.cpp
@@ -26,7 +26,7 @@
// runIndexedTest
//---------------------------------------------
-void CompoundTransliteratorTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CompoundTransliteratorTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln((UnicodeString)"TestSuite CompoundTransliterator API ");
switch (index) {
@@ -346,7 +346,7 @@ void CompoundTransliteratorTest::expect(const CompoundTransliterator& t,
}
void CompoundTransliteratorTest::expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult) {
if (pass) {
logln(UnicodeString("(")+tag+") " + prettify(summary));
diff --git a/icu4c/source/test/intltest/cpdtrtst.h b/icu4c/source/test/intltest/cpdtrtst.h
index 75917373bf7..d0e6fddc051 100644
--- a/icu4c/source/test/intltest/cpdtrtst.h
+++ b/icu4c/source/test/intltest/cpdtrtst.h
@@ -29,7 +29,7 @@ class CompoundTransliterator;
*/
class CompoundTransliteratorTest : public IntlTest {
public:
- void runIndexedTest(int32_t index, bool_t exec, char* &name, char* par=NULL);
+ void runIndexedTest(int32_t index, UBool exec, char* &name, char* par=NULL);
/*Tests the constructors */
void TestConstruction(void);
@@ -56,7 +56,7 @@ public:
const UnicodeString& expectedResult);
void expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult);
diff --git a/icu4c/source/test/intltest/cppcnvt.cpp b/icu4c/source/test/intltest/cppcnvt.cpp
index edce4fee0a1..418094eca29 100644
--- a/icu4c/source/test/intltest/cppcnvt.cpp
+++ b/icu4c/source/test/intltest/cppcnvt.cpp
@@ -41,7 +41,7 @@ UConverterToUCallback otherCharAction(UConverterToUCallback MIA);
/*Asciifies the UErrorCodes*/
#define myErrorName(errorCode) u_errorName(errorCode)
-void ConvertTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void ConvertTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite ConvertTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/cppcnvt.h b/icu4c/source/test/intltest/cppcnvt.h
index 9878d83db79..13d3bdb261c 100644
--- a/icu4c/source/test/intltest/cppcnvt.h
+++ b/icu4c/source/test/intltest/cppcnvt.h
@@ -14,7 +14,7 @@ public:
ConvertTest() {};
~ConvertTest() {};
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* Test everything
diff --git a/icu4c/source/test/intltest/currcoll.cpp b/icu4c/source/test/intltest/currcoll.cpp
index 9ebcbf9915f..db2c335cbc2 100644
--- a/icu4c/source/test/intltest/currcoll.cpp
+++ b/icu4c/source/test/intltest/currcoll.cpp
@@ -123,7 +123,7 @@ void CollationCurrencyTest::currencyTest(char *par)
}
}
-void CollationCurrencyTest::runIndexedTest(int32_t index, bool_t exec, char* &name, char* par)
+void CollationCurrencyTest::runIndexedTest(int32_t index, UBool exec, char* &name, char* par)
{
if (exec)
{
diff --git a/icu4c/source/test/intltest/currcoll.h b/icu4c/source/test/intltest/currcoll.h
index c72d2761dd6..44ff9a6efb9 100644
--- a/icu4c/source/test/intltest/currcoll.h
+++ b/icu4c/source/test/intltest/currcoll.h
@@ -40,7 +40,7 @@ public:
CollationCurrencyTest();
virtual ~CollationCurrencyTest();
- void runIndexedTest(int32_t index, bool_t exec, char* &name, char* par = NULL);
+ void runIndexedTest(int32_t index, UBool exec, char* &name, char* par = NULL);
void currencyTest(char *par);
};
diff --git a/icu4c/source/test/intltest/dacoll.cpp b/icu4c/source/test/intltest/dacoll.cpp
index 3a751802533..f7f8ff70b4b 100644
--- a/icu4c/source/test/intltest/dacoll.cpp
+++ b/icu4c/source/test/intltest/dacoll.cpp
@@ -228,7 +228,7 @@ void CollationDanishTest::TestPrimary( char* par )
}
}
-void CollationDanishTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationDanishTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationDanishTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/dacoll.h b/icu4c/source/test/intltest/dacoll.h
index a73c8d27b24..9e44e577c73 100644
--- a/icu4c/source/test/intltest/dacoll.h
+++ b/icu4c/source/test/intltest/dacoll.h
@@ -33,7 +33,7 @@ public:
CollationDanishTest();
virtual ~CollationDanishTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// main test routine, Tests rules specific to danish collation
void doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/dcfmapts.cpp b/icu4c/source/test/intltest/dcfmapts.cpp
index 56589acb5cf..5fddafacd86 100644
--- a/icu4c/source/test/intltest/dcfmapts.cpp
+++ b/icu4c/source/test/intltest/dcfmapts.cpp
@@ -14,7 +14,7 @@
// try to test the full functionality. It just calls each function in the class and
// verifies that it works on a basic level.
-void IntlTestDecimalFormatAPI::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestDecimalFormatAPI::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln((UnicodeString)"TestSuite DecimalFormatAPI");
switch (index) {
@@ -219,7 +219,7 @@ void IntlTestDecimalFormatAPI::testAPI(char *par)
}
pat.setDecimalSeparatorAlwaysShown(TRUE);
- bool_t tf = pat.isDecimalSeparatorAlwaysShown();
+ UBool tf = pat.isDecimalSeparatorAlwaysShown();
logln((UnicodeString)"DecimalSeparatorIsAlwaysShown (should be TRUE) is " + (UnicodeString) (tf ? "TRUE" : "FALSE"));
if(tf != TRUE) {
errln((UnicodeString)"ERROR: setDecimalSeparatorAlwaysShown() failed");
diff --git a/icu4c/source/test/intltest/dcfmapts.h b/icu4c/source/test/intltest/dcfmapts.h
index b3837a12561..bff093833aa 100644
--- a/icu4c/source/test/intltest/dcfmapts.h
+++ b/icu4c/source/test/intltest/dcfmapts.h
@@ -14,7 +14,7 @@
class IntlTestDecimalFormatAPI: public IntlTest {
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
private:
/**
diff --git a/icu4c/source/test/intltest/decoll.cpp b/icu4c/source/test/intltest/decoll.cpp
index 0e77860ca89..06c9028508e 100644
--- a/icu4c/source/test/intltest/decoll.cpp
+++ b/icu4c/source/test/intltest/decoll.cpp
@@ -122,7 +122,7 @@ void CollationGermanTest::TestPrimary( char* par )
}
}
-void CollationGermanTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationGermanTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationGermanTest: ");
switch (index)
diff --git a/icu4c/source/test/intltest/decoll.h b/icu4c/source/test/intltest/decoll.h
index bdefe2c80f1..972f3b279e5 100644
--- a/icu4c/source/test/intltest/decoll.h
+++ b/icu4c/source/test/intltest/decoll.h
@@ -31,7 +31,7 @@ public:
CollationGermanTest();
virtual ~CollationGermanTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
//main test routine, tests rules specific to germa locale
void doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/dtfmapts.cpp b/icu4c/source/test/intltest/dtfmapts.cpp
index 92621448e38..2a8c8027924 100644
--- a/icu4c/source/test/intltest/dtfmapts.cpp
+++ b/icu4c/source/test/intltest/dtfmapts.cpp
@@ -19,7 +19,7 @@
// try to test the full functionality. It just calls each function in the class and
// verifies that it works on a basic level.
-void IntlTestDateFormatAPI::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestDateFormatAPI::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite DateFormatAPI");
switch (index) {
diff --git a/icu4c/source/test/intltest/dtfmapts.h b/icu4c/source/test/intltest/dtfmapts.h
index 301590179f3..420ea58a698 100644
--- a/icu4c/source/test/intltest/dtfmapts.h
+++ b/icu4c/source/test/intltest/dtfmapts.h
@@ -18,7 +18,7 @@
* verifies that it works on a basic level.
*/
class IntlTestDateFormatAPI: public IntlTest {
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
private:
/**
diff --git a/icu4c/source/test/intltest/dtfmrgts.cpp b/icu4c/source/test/intltest/dtfmrgts.cpp
index 8b76ca79916..844a8107711 100644
--- a/icu4c/source/test/intltest/dtfmrgts.cpp
+++ b/icu4c/source/test/intltest/dtfmrgts.cpp
@@ -21,7 +21,7 @@
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
void
-DateFormatRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+DateFormatRegressionTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite DateFormatRegressionTest");
switch (index) {
@@ -169,7 +169,7 @@ void DateFormatRegressionTest::Test4052408(void)
(UnicodeString) "TIMEZONE_FIELD"
};
- bool_t pass = TRUE;
+ UBool pass = TRUE;
for(int i = 0; i <= 17; ++i) {
FieldPosition pos(i);
UnicodeString buf;
@@ -375,7 +375,7 @@ void DateFormatRegressionTest::Test4061287(void)
e.printStackTrace();
}*/
df->setLenient(FALSE);
- bool_t ok = FALSE;
+ UBool ok = FALSE;
//try {
logln(UnicodeString("") + df->parse("35/01/1971", status));
if(U_FAILURE(status))
@@ -595,7 +595,7 @@ void DateFormatRegressionTest::Test4100302(void)
Locale::US
};
//try {
- bool_t pass = TRUE;
+ UBool pass = TRUE;
for(int i = 0; i < 21; i++) {
Format *format = DateFormat::createDateTimeInstance(DateFormat::FULL,
@@ -1042,7 +1042,7 @@ void DateFormatRegressionTest::Test4182066(void) {
};
UnicodeString out;
- bool_t pass = TRUE;
+ UBool pass = TRUE;
for (int32_t i=0; i 0, we don't run each exhaustive possibility.
// There are 24 total possible tests per each locale. A SPARSENESS
@@ -33,7 +33,7 @@ int32_t DateFormatRoundTripTest::DEPTH = 5;
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
void
-DateFormatRoundTripTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+DateFormatRoundTripTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite NumberFormatRegressionTest");
switch (index) {
@@ -42,7 +42,7 @@ DateFormatRoundTripTest::runIndexedTest( int32_t index, bool_t exec, char* &name
}
}
-bool_t
+UBool
DateFormatRoundTripTest::failure(UErrorCode status, const char* msg)
{
if(U_FAILURE(status)) {
@@ -107,7 +107,7 @@ void DateFormatRoundTripTest::test(const Locale& loc)
// 4 date
// 4 time
// 16 date-time
- bool_t TEST_TABLE [24];//= new boolean[24];
+ UBool TEST_TABLE [24];//= new boolean[24];
int32_t i = 0;
for(i = 0; i < 24; ++i)
TEST_TABLE[i] = TRUE;
@@ -151,7 +151,7 @@ void DateFormatRoundTripTest::test(const Locale& loc)
}
}
-void DateFormatRoundTripTest::test(DateFormat *fmt, bool_t timeOnly)
+void DateFormatRoundTripTest::test(DateFormat *fmt, UBool timeOnly)
{
UnicodeString pat;
if(fmt->getDynamicClassID() != SimpleDateFormat::getStaticClassID()) {
@@ -166,8 +166,8 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, bool_t timeOnly)
// quoted characters. Currently, this isn't a problem with the locale
// patterns we have, but it may be a problem later.
- bool_t hasEra = (pat.indexOf(UnicodeString("G")) != -1);
- bool_t hasZone = (pat.indexOf(UnicodeString("z")) != -1);
+ UBool hasEra = (pat.indexOf(UnicodeString("G")) != -1);
+ UBool hasZone = (pat.indexOf(UnicodeString("z")) != -1);
// Because patterns contain incomplete data representing the Date,
// we must be careful of how we do the roundtrip. We start with
@@ -204,7 +204,7 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, bool_t timeOnly)
if(loop > 0) {
if(smatch == 0) {
- bool_t match = s[loop] == s[loop-1];
+ UBool match = s[loop] == s[loop-1];
if(smatch == 0) {
if(match)
smatch = loop;
@@ -215,7 +215,7 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, bool_t timeOnly)
if(dmatch == 0) {
// {sfb} watch out here, this might not work
- bool_t match = d[loop]/*.getTime()*/ == d[loop-1]/*.getTime()*/;
+ UBool match = d[loop]/*.getTime()*/ == d[loop-1]/*.getTime()*/;
if(dmatch == 0) {
if(match)
dmatch = loop;
diff --git a/icu4c/source/test/intltest/dtfmtrtts.h b/icu4c/source/test/intltest/dtfmtrtts.h
index 3216679a634..f1b00d032e6 100644
--- a/icu4c/source/test/intltest/dtfmtrtts.h
+++ b/icu4c/source/test/intltest/dtfmtrtts.h
@@ -22,12 +22,12 @@ class Calendar;
class DateFormatRoundTripTest : public IntlTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
void TestDateFormatRoundTrip(void);
void test(const Locale& loc);
- void test(DateFormat *fmt, bool_t timeOnly = FALSE );
+ void test(DateFormat *fmt, UBool timeOnly = FALSE );
int32_t getField(UDate d, int32_t f);
UnicodeString& escape(const UnicodeString& src, UnicodeString& dst);
UDate generateDate(void);
@@ -74,11 +74,11 @@ static double randDouble(double range)
}
protected:
- bool_t failure(UErrorCode status, const char* msg);
+ UBool failure(UErrorCode status, const char* msg);
private:
- static bool_t INFINITE;
+ static UBool INFINITE;
static int32_t SPARSENESS;
static int32_t TRIALS;
static int32_t DEPTH;
diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp
index 58efa5eb7a6..259ae7c0db7 100644
--- a/icu4c/source/test/intltest/dtfmttst.cpp
+++ b/icu4c/source/test/intltest/dtfmttst.cpp
@@ -17,7 +17,7 @@
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
-void DateFormatTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void DateFormatTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite DateFormatTest");
switch (index) {
@@ -112,7 +112,7 @@ void DateFormatTest::TestWallyWedel()
/*
* Show our result.
*/
- bool_t ok = fmtDstOffset == 0 || *fmtDstOffset == dstOffset;
+ UBool ok = fmtDstOffset == 0 || *fmtDstOffset == dstOffset;
if (ok)
{
logln(UnicodeString() + i + " " + *ids[i] + " " + dstOffset +
@@ -388,7 +388,7 @@ DateFormatTest::TestRunTogetherPattern985()
UErrorCode status = U_ZERO_ERROR;
UnicodeString format("yyyyMMddHHmmssSSS");
UnicodeString now, then;
- //bool_t flag;
+ //UBool flag;
SimpleDateFormat *formatter = new SimpleDateFormat(format, status);
UDate date1 = Calendar::getNow();
((DateFormat*)formatter)->format(date1, now);
diff --git a/icu4c/source/test/intltest/dtfmttst.h b/icu4c/source/test/intltest/dtfmttst.h
index b0cd8466542..b7b4cf6fcfc 100644
--- a/icu4c/source/test/intltest/dtfmttst.h
+++ b/icu4c/source/test/intltest/dtfmttst.h
@@ -16,7 +16,7 @@
**/
class DateFormatTest: public CalendarTimeZoneTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
/**
* "Test written by Wally Wedel and emailed to me."
diff --git a/icu4c/source/test/intltest/encoll.cpp b/icu4c/source/test/intltest/encoll.cpp
index 44d14334298..9bdd5585a02 100644
--- a/icu4c/source/test/intltest/encoll.cpp
+++ b/icu4c/source/test/intltest/encoll.cpp
@@ -337,7 +337,7 @@ void CollationEnglishTest::TestSecondary( char* par )
}
}
-void CollationEnglishTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationEnglishTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationEnglishTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/encoll.h b/icu4c/source/test/intltest/encoll.h
index 49cf4448be4..d46e4274913 100644
--- a/icu4c/source/test/intltest/encoll.h
+++ b/icu4c/source/test/intltest/encoll.h
@@ -33,7 +33,7 @@ public:
CollationEnglishTest();
virtual ~CollationEnglishTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// main test routine, tests rules defined by the "en" locale
void doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/escoll.cpp b/icu4c/source/test/intltest/escoll.cpp
index 485e63a1b8c..ba02ac600c0 100644
--- a/icu4c/source/test/intltest/escoll.cpp
+++ b/icu4c/source/test/intltest/escoll.cpp
@@ -106,7 +106,7 @@ void CollationSpanishTest::TestPrimary( char* par )
}
}
-void CollationSpanishTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationSpanishTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationSpanishTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/escoll.h b/icu4c/source/test/intltest/escoll.h
index 17c88d58bc8..ce53a7ad572 100644
--- a/icu4c/source/test/intltest/escoll.h
+++ b/icu4c/source/test/intltest/escoll.h
@@ -33,7 +33,7 @@ public:
CollationSpanishTest();
virtual ~CollationSpanishTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// amin test routine, tests rules specific to the spanish locale
void doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/ficoll.cpp b/icu4c/source/test/intltest/ficoll.cpp
index 086fde448a5..e234b69c701 100644
--- a/icu4c/source/test/intltest/ficoll.cpp
+++ b/icu4c/source/test/intltest/ficoll.cpp
@@ -93,7 +93,7 @@ void CollationFinnishTest::TestPrimary( char* par )
}
}
-void CollationFinnishTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationFinnishTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationFinnishTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/ficoll.h b/icu4c/source/test/intltest/ficoll.h
index f83e18318f8..7d28c9475c5 100644
--- a/icu4c/source/test/intltest/ficoll.h
+++ b/icu4c/source/test/intltest/ficoll.h
@@ -32,7 +32,7 @@ public:
CollationFinnishTest();
virtual ~CollationFinnishTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// main test routine, tests rules specific to the finish locale
void doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/frcoll.cpp b/icu4c/source/test/intltest/frcoll.cpp
index 1afecc96dcf..ba36badab36 100644
--- a/icu4c/source/test/intltest/frcoll.cpp
+++ b/icu4c/source/test/intltest/frcoll.cpp
@@ -188,7 +188,7 @@ void CollationFrenchTest::TestExtra( char* par )
}
}
-void CollationFrenchTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationFrenchTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationFrenchTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/frcoll.h b/icu4c/source/test/intltest/frcoll.h
index b1b54030000..a2ecabef692 100644
--- a/icu4c/source/test/intltest/frcoll.h
+++ b/icu4c/source/test/intltest/frcoll.h
@@ -31,7 +31,7 @@ public:
CollationFrenchTest();
virtual ~CollationFrenchTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// amin test routine, test rules specific to the french locale
void doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/g7coll.cpp b/icu4c/source/test/intltest/g7coll.cpp
index a080df04987..0bca73085e0 100644
--- a/icu4c/source/test/intltest/g7coll.cpp
+++ b/icu4c/source/test/intltest/g7coll.cpp
@@ -280,7 +280,7 @@ void G7CollationTest::TestDemo4( char* par )
delete col;
}
-void G7CollationTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void G7CollationTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite G7CollationTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/g7coll.h b/icu4c/source/test/intltest/g7coll.h
index 8a6491383d4..4405231d7bb 100644
--- a/icu4c/source/test/intltest/g7coll.h
+++ b/icu4c/source/test/intltest/g7coll.h
@@ -57,7 +57,7 @@ public:
G7CollationTest() {}
virtual ~G7CollationTest() {}
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// main test routine, tests comparisons for a set of strings against sets of expected results
void doTest( Collator* col, UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/hajatrts.cpp b/icu4c/source/test/intltest/hajatrts.cpp
index df6dbdce993..446334dff5f 100644
--- a/icu4c/source/test/intltest/hajatrts.cpp
+++ b/icu4c/source/test/intltest/hajatrts.cpp
@@ -39,7 +39,7 @@ static int32_t getInt(UnicodeString str)
// runIndexedTest
//---------------------------------------------
-void HangToJamoTransliteratorTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void HangToJamoTransliteratorTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln((UnicodeString)"TestSuite HangToJamoul Transliterator API ");
switch (index) {
@@ -60,7 +60,7 @@ class TestHangulFilter : public UnicodeFilter {
virtual UnicodeFilter* clone() const {
return new TestHangulFilter(*this);
}
- virtual bool_t contains(UChar c) const {
+ virtual UBool contains(UChar c) const {
if(c == 0xae4c )
return FALSE;
else
@@ -318,7 +318,7 @@ void HangToJamoTransliteratorTest::expect(const HangulJamoTransliterator& t,
}
void HangToJamoTransliteratorTest::expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult) {
if (pass) {
logln(UnicodeString("(")+tag+") " + prettify(summary));
diff --git a/icu4c/source/test/intltest/hajatrts.h b/icu4c/source/test/intltest/hajatrts.h
index 7968fc637bc..5bc7c46e6b1 100644
--- a/icu4c/source/test/intltest/hajatrts.h
+++ b/icu4c/source/test/intltest/hajatrts.h
@@ -29,7 +29,7 @@ class HangulJamoTransliterator;
*/
class HangToJamoTransliteratorTest : public IntlTest {
public:
- void runIndexedTest(int32_t index, bool_t exec, char* &name, char* par=NULL);
+ void runIndexedTest(int32_t index, UBool exec, char* &name, char* par=NULL);
/*Tests the constructors */
void TestConstruction(void);
@@ -58,7 +58,7 @@ public:
const UnicodeString& expectedResult);
void expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult);
diff --git a/icu4c/source/test/intltest/hxuntrts.cpp b/icu4c/source/test/intltest/hxuntrts.cpp
index cd4fdfa0e0c..a60867ede1d 100644
--- a/icu4c/source/test/intltest/hxuntrts.cpp
+++ b/icu4c/source/test/intltest/hxuntrts.cpp
@@ -40,7 +40,7 @@ static int32_t getInt(UnicodeString str)
// runIndexedTest
//---------------------------------------------
-void HexToUniTransliteratorTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void HexToUniTransliteratorTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln((UnicodeString)"TestSuite HexadecimalToUnicode Transliterator API ");
switch (index) {
@@ -60,7 +60,7 @@ class TestHexFilter : public UnicodeFilter {
virtual UnicodeFilter* clone() const {
return new TestHexFilter(*this);
}
- virtual bool_t contains(UChar c) const {
+ virtual UBool contains(UChar c) const {
if(c == 0x0061 || c == 0x0063 )
return FALSE;
else
@@ -397,7 +397,7 @@ void HexToUniTransliteratorTest::expect(const HexToUnicodeTransliterator& t,
}
void HexToUniTransliteratorTest::expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult) {
if (pass) {
logln(UnicodeString("(")+tag+") " + prettify(summary));
diff --git a/icu4c/source/test/intltest/hxuntrts.h b/icu4c/source/test/intltest/hxuntrts.h
index 72bd1124b7e..d38e8036b39 100644
--- a/icu4c/source/test/intltest/hxuntrts.h
+++ b/icu4c/source/test/intltest/hxuntrts.h
@@ -29,7 +29,7 @@ class HexToUnicodeTransliterator;
*/
class HexToUniTransliteratorTest : public IntlTest {
public:
- void runIndexedTest(int32_t index, bool_t exec, char* &name, char* par=NULL);
+ void runIndexedTest(int32_t index, UBool exec, char* &name, char* par=NULL);
/*Tests the constructors */
void TestConstruction(void);
@@ -62,7 +62,7 @@ public:
const UnicodeString& expectedResult);
void expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult);
diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp
index 1dabfa8ebf8..4aac8313d14 100644
--- a/icu4c/source/test/intltest/intltest.cpp
+++ b/icu4c/source/test/intltest/intltest.cpp
@@ -564,7 +564,7 @@ void IntlTest::setCaller( IntlTest* callingTest )
}
}
-bool_t IntlTest::callTest( IntlTest& testToBeCalled, char* par )
+UBool IntlTest::callTest( IntlTest& testToBeCalled, char* par )
{
execCount--; // correct a previously assumed test-exec, as this only calls a subtest
testToBeCalled.setCaller( this );
@@ -576,30 +576,30 @@ void IntlTest::setPath( char* path )
this->path = path;
}
-bool_t IntlTest::setVerbose( bool_t verbose )
+UBool IntlTest::setVerbose( UBool verbose )
{
- bool_t rval = this->verbose;
+ UBool rval = this->verbose;
this->verbose = verbose;
return rval;
}
-bool_t IntlTest::setNoErrMsg( bool_t no_err_msg )
+UBool IntlTest::setNoErrMsg( UBool no_err_msg )
{
- bool_t rval = this->no_err_msg;
+ UBool rval = this->no_err_msg;
this->no_err_msg = no_err_msg;
return rval;
}
-bool_t IntlTest::setQuick( bool_t quick )
+UBool IntlTest::setQuick( UBool quick )
{
- bool_t rval = this->quick;
+ UBool rval = this->quick;
this->quick = quick;
return rval;
}
-bool_t IntlTest::setLeaks( bool_t leaks )
+UBool IntlTest::setLeaks( UBool leaks )
{
- bool_t rval = this->leaks;
+ UBool rval = this->leaks;
this->leaks = leaks;
return rval;
}
@@ -609,9 +609,9 @@ int32_t IntlTest::getErrors( void )
return errorCount;
}
-bool_t IntlTest::runTest( char* name, char* par )
+UBool IntlTest::runTest( char* name, char* par )
{
- bool_t rval;
+ UBool rval;
char* pos = NULL;
if (name) pos = strchr( name, delim ); // check if name contains path (by looking for '/')
@@ -638,7 +638,7 @@ bool_t IntlTest::runTest( char* name, char* par )
}
// call individual tests, to be overriden to call implementations
-void IntlTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// to be overriden by a method like:
/*
@@ -653,13 +653,13 @@ void IntlTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* pa
}
-bool_t IntlTest::runTestLoop( char* testname, char* par )
+UBool IntlTest::runTestLoop( char* testname, char* par )
{
int32_t index = 0;
char* name;
- bool_t run_this_test;
+ UBool run_this_test;
int32_t lastErrorCount;
- bool_t rval = FALSE;
+ UBool rval = FALSE;
IntlTest* saveTest = gTest;
gTest = this;
@@ -669,7 +669,7 @@ bool_t IntlTest::runTestLoop( char* testname, char* par )
if (!testname) {
run_this_test = TRUE;
}else{
- run_this_test = (bool_t) (strcmp( name, testname ) == 0);
+ run_this_test = (UBool) (strcmp( name, testname ) == 0);
}
if (run_this_test) {
lastErrorCount = errorCount;
@@ -747,7 +747,7 @@ void IntlTest::errln( const UnicodeString &message )
if (!no_err_msg) LL_message( message, TRUE );
}
-void IntlTest::LL_message( UnicodeString message, bool_t newline )
+void IntlTest::LL_message( UnicodeString message, UBool newline )
{
// string that starts with a LineFeed character and continues
// with spaces according to the current indentation
@@ -793,7 +793,7 @@ void IntlTest::LL_message( UnicodeString message, bool_t newline )
*/
void IntlTest::usage( void )
{
- bool_t save_verbose = setVerbose( TRUE );
+ UBool save_verbose = setVerbose( TRUE );
logln("Test names:");
logln("-----------");
@@ -811,7 +811,7 @@ void IntlTest::usage( void )
// memory leak reporting software will be able to take advantage of the testsuite
// being run a second time local to a specific method in order to report only actual leaks
-bool_t
+UBool
IntlTest::run_phase2( char* name, char* par ) // supports reporting memory leaks
{
UnicodeString* strLeak = new UnicodeString("forced leak"); // for verifying purify filter
@@ -827,13 +827,13 @@ main(int argc, char* argv[])
argc = ccommand( &argv );
#endif
- bool_t syntax = FALSE;
- bool_t all = TRUE;
- bool_t verbose = FALSE;
- bool_t no_err_msg = FALSE;
- bool_t quick = TRUE;
- bool_t name = FALSE;
- bool_t leaks = FALSE;
+ UBool syntax = FALSE;
+ UBool all = TRUE;
+ UBool verbose = FALSE;
+ UBool no_err_msg = FALSE;
+ UBool quick = TRUE;
+ UBool name = FALSE;
+ UBool leaks = FALSE;
for (int i = 1; i < argc; ++i) {
if (argv[i][0] == '-') {
@@ -891,7 +891,7 @@ main(int argc, char* argv[])
return 1;
}
- bool_t all_tests_exist = TRUE;
+ UBool all_tests_exist = TRUE;
MajorTestLevel major;
major.setVerbose( verbose );
major.setNoErrMsg( no_err_msg );
@@ -964,7 +964,7 @@ main(int argc, char* argv[])
parameter += 1;
}
execCount = 0;
- bool_t res = major.runTest( name, parameter );
+ UBool res = major.runTest( name, parameter );
if (leaks && res) {
major.run_phase2( name, parameter );
}
diff --git a/icu4c/source/test/intltest/intltest.h b/icu4c/source/test/intltest/intltest.h
index 723662d39d1..3828221b8c2 100644
--- a/icu4c/source/test/intltest/intltest.h
+++ b/icu4c/source/test/intltest/intltest.h
@@ -50,12 +50,12 @@ public:
IntlTest();
- virtual bool_t runTest( char* name = NULL, char* par = NULL ); // not to be overidden
+ virtual UBool runTest( char* name = NULL, char* par = NULL ); // not to be overidden
- virtual bool_t setVerbose( bool_t verbose = TRUE );
- virtual bool_t setNoErrMsg( bool_t no_err_msg = TRUE );
- virtual bool_t setQuick( bool_t quick = TRUE );
- virtual bool_t setLeaks( bool_t leaks = TRUE );
+ virtual UBool setVerbose( UBool verbose = TRUE );
+ virtual UBool setNoErrMsg( UBool no_err_msg = TRUE );
+ virtual UBool setQuick( UBool quick = TRUE );
+ virtual UBool setLeaks( UBool leaks = TRUE );
virtual int32_t getErrors( void );
@@ -91,27 +91,27 @@ public:
FILE *testoutfp;
protected:
- virtual void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL ); // overide !
+ virtual void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL ); // overide !
- virtual bool_t runTestLoop( char* testname, char* par );
+ virtual UBool runTestLoop( char* testname, char* par );
virtual int32_t IncErrorCount( void );
- virtual bool_t callTest( IntlTest& testToBeCalled, char* par );
+ virtual UBool callTest( IntlTest& testToBeCalled, char* par );
- bool_t LL_linestart;
+ UBool LL_linestart;
int32_t LL_indentlevel;
- bool_t verbose;
- bool_t no_err_msg;
- bool_t quick;
- bool_t leaks;
+ UBool verbose;
+ UBool no_err_msg;
+ UBool quick;
+ UBool leaks;
int32_t errorCount;
IntlTest* caller;
char* path; // specifies subtests
- virtual void LL_message( UnicodeString message, bool_t newline );
+ virtual void LL_message( UnicodeString message, UBool newline );
// used for collation result reporting, defined here for convenience
virtual void reportCResult( UnicodeString &source, UnicodeString &target,
@@ -135,7 +135,7 @@ protected:
static const char* getTestDirectory(void);
public:
- bool_t run_phase2( char* name, char* par ); // internally, supports reporting memory leaks
+ UBool run_phase2( char* name, char* par ); // internally, supports reporting memory leaks
// static members
public:
diff --git a/icu4c/source/test/intltest/isocoll.cpp b/icu4c/source/test/intltest/isocoll.cpp
index 103fe523c91..a713fbec839 100644
--- a/icu4c/source/test/intltest/isocoll.cpp
+++ b/icu4c/source/test/intltest/isocoll.cpp
@@ -7109,7 +7109,7 @@ void CollationISOTest::TestAll( char* par )
}
}
-void CollationISOTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationISOTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationISOTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/isocoll.h b/icu4c/source/test/intltest/isocoll.h
index 89824f5906c..b3ee009d8c9 100644
--- a/icu4c/source/test/intltest/isocoll.h
+++ b/icu4c/source/test/intltest/isocoll.h
@@ -35,7 +35,7 @@ public:
CollationISOTest();
virtual ~CollationISOTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// test proper comparing for 3774 entries of ISO 14651 characters
void TestAll( char* par );
diff --git a/icu4c/source/test/intltest/itconv.cpp b/icu4c/source/test/intltest/itconv.cpp
index c3bcb5b1864..5b7aca6e976 100644
--- a/icu4c/source/test/intltest/itconv.cpp
+++ b/icu4c/source/test/intltest/itconv.cpp
@@ -13,7 +13,7 @@
#include "itconv.h"
#include "cppcnvt.h"
-void IntlTestConvert::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestConvert::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite Convert: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/itconv.h b/icu4c/source/test/intltest/itconv.h
index ee558efb406..9cd22939aba 100644
--- a/icu4c/source/test/intltest/itconv.h
+++ b/icu4c/source/test/intltest/itconv.h
@@ -18,7 +18,7 @@
class IntlTestConvert: public IntlTest {
public:
-virtual void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+virtual void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
diff --git a/icu4c/source/test/intltest/itercoll.cpp b/icu4c/source/test/intltest/itercoll.cpp
index 7c9cbed4a03..cb264c7ab2e 100644
--- a/icu4c/source/test/intltest/itercoll.cpp
+++ b/icu4c/source/test/intltest/itercoll.cpp
@@ -531,7 +531,7 @@ void CollationIteratorTest::assertEqual(CollationElementIterator &i1, CollationE
while (c1 != CollationElementIterator::NULLORDER);
}
-void CollationIteratorTest::runIndexedTest(int32_t index, bool_t exec, char* &name, char* par)
+void CollationIteratorTest::runIndexedTest(int32_t index, UBool exec, char* &name, char* par)
{
if (exec)
{
diff --git a/icu4c/source/test/intltest/itercoll.h b/icu4c/source/test/intltest/itercoll.h
index 14e1c2419e0..7f2ce0a0572 100644
--- a/icu4c/source/test/intltest/itercoll.h
+++ b/icu4c/source/test/intltest/itercoll.h
@@ -45,7 +45,7 @@ public:
CollationIteratorTest();
virtual ~CollationIteratorTest();
- void runIndexedTest(int32_t index, bool_t exec, char* &name, char* par = NULL);
+ void runIndexedTest(int32_t index, UBool exec, char* &name, char* par = NULL);
/**
* Test for CollationElementIterator.previous()
diff --git a/icu4c/source/test/intltest/itformat.cpp b/icu4c/source/test/intltest/itformat.cpp
index 2cce141112e..21c21c82179 100644
--- a/icu4c/source/test/intltest/itformat.cpp
+++ b/icu4c/source/test/intltest/itformat.cpp
@@ -38,7 +38,7 @@
#include "tzregts.h" // TimeZoneRegressionTest
#include "usettest.h" // UnicodeSetTest
-void IntlTestFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestFormat::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// for all format tests, always set default Locale and TimeZone to ENGLISH and PST.
TimeZone* saveDefaultTimeZone;
diff --git a/icu4c/source/test/intltest/itformat.h b/icu4c/source/test/intltest/itformat.h
index 67a6a02ea1c..6c958345ce5 100644
--- a/icu4c/source/test/intltest/itformat.h
+++ b/icu4c/source/test/intltest/itformat.h
@@ -17,7 +17,7 @@
class IntlTestFormat: public IntlTest {
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
diff --git a/icu4c/source/test/intltest/itmajor.cpp b/icu4c/source/test/intltest/itmajor.cpp
index 00573e8433b..b42af4cec34 100644
--- a/icu4c/source/test/intltest/itmajor.cpp
+++ b/icu4c/source/test/intltest/itmajor.cpp
@@ -19,7 +19,7 @@
#include "ittrans.h"
#include "itrbbi.h"
-void MajorTestLevel::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void MajorTestLevel::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
switch (index) {
case 0: name = "utility";
diff --git a/icu4c/source/test/intltest/itmajor.h b/icu4c/source/test/intltest/itmajor.h
index 0e3473891d5..65305d4cb9f 100644
--- a/icu4c/source/test/intltest/itmajor.h
+++ b/icu4c/source/test/intltest/itmajor.h
@@ -17,7 +17,7 @@
class MajorTestLevel: public IntlTest {
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
#endif
diff --git a/icu4c/source/test/intltest/itrbbi.cpp b/icu4c/source/test/intltest/itrbbi.cpp
index 469e449c08d..a329fe3ee04 100644
--- a/icu4c/source/test/intltest/itrbbi.cpp
+++ b/icu4c/source/test/intltest/itrbbi.cpp
@@ -17,7 +17,7 @@
#include "rbbiapts.h"
#include "rbbitst.h"
-void IntlTestRBBI::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestRBBI::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite RuleBasedBreakIterator: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/itrbbi.h b/icu4c/source/test/intltest/itrbbi.h
index 7d76db37f05..41941fe921d 100644
--- a/icu4c/source/test/intltest/itrbbi.h
+++ b/icu4c/source/test/intltest/itrbbi.h
@@ -21,7 +21,7 @@
class IntlTestRBBI: public IntlTest {
public:
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
diff --git a/icu4c/source/test/intltest/ittrans.cpp b/icu4c/source/test/intltest/ittrans.cpp
index 19f052314ec..f6ab2b9f4c1 100644
--- a/icu4c/source/test/intltest/ittrans.cpp
+++ b/icu4c/source/test/intltest/ittrans.cpp
@@ -29,7 +29,7 @@
#include "hajatrts.h"
#include "ufltlgts.h"
-void IntlTestTransliterator::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestTransliterator::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite Transliterator");
switch (index) {
diff --git a/icu4c/source/test/intltest/ittrans.h b/icu4c/source/test/intltest/ittrans.h
index f92bc3c58d7..c224c1cb294 100644
--- a/icu4c/source/test/intltest/ittrans.h
+++ b/icu4c/source/test/intltest/ittrans.h
@@ -21,7 +21,7 @@
class IntlTestTransliterator: public IntlTest {
public:
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
diff --git a/icu4c/source/test/intltest/ittxtbd.cpp b/icu4c/source/test/intltest/ittxtbd.cpp
index ca690d7f902..822ba45b8d1 100644
--- a/icu4c/source/test/intltest/ittxtbd.cpp
+++ b/icu4c/source/test/intltest/ittxtbd.cpp
@@ -18,7 +18,7 @@
*/
class Enumeration { // text enumeration
public:
- virtual bool_t hasMoreElements() = 0;
+ virtual UBool hasMoreElements() = 0;
virtual UnicodeString nextElement() = 0;
};
@@ -44,7 +44,7 @@ public:
public:
VectorEnumeration(Vector* vector) : fVector(vector), fPos(&vector->fBase) {}
- bool_t hasMoreElements() { return fPos->fLink != &fVector->fBase; }
+ UBool hasMoreElements() { return fPos->fLink != &fVector->fBase; }
UnicodeString nextElement() { fPos = fPos->fLink; return fPos->fText; }
Vector* fVector;
@@ -715,7 +715,7 @@ void IntlTestTextBoundary::TestLineInvariants()
continue;
work[2] = c;
e->setText(&work);
- bool_t saw2 = FALSE;
+ UBool saw2 = FALSE;
for (int l = e->first(); l != BreakIterator::DONE; l = e->next())
if (l == 2)
saw2 = TRUE;
@@ -1010,8 +1010,8 @@ void IntlTestTextBoundary::TestBug4153072() {
UnicodeString str("...Hello, World!...");
int32_t begin = 3;
int32_t end = str.length() - 3;
- bool_t gotException = FALSE;
- bool_t dummy;
+ UBool gotException = FALSE;
+ UBool dummy;
StringCharacterIterator* textIterator = new StringCharacterIterator(str, begin, end, begin);
iter->adoptText(textIterator);
@@ -1058,7 +1058,7 @@ void IntlTestTextBoundary::TestPreceding()
// runIndexedTest
//---------------------------------------------
-void IntlTestTextBoundary::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestTextBoundary::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite TextBoundary: ");
switch (index) {
@@ -1285,7 +1285,7 @@ void IntlTestTextBoundary::testPreceding(BreakIterator& bi, UnicodeString& text,
void IntlTestTextBoundary::testIsBoundary(BreakIterator& bi, UnicodeString& text, int32_t *boundaries) {
logln("testIsBoundary():");
int p = 1;
- bool_t isB;
+ UBool isB;
for (int i = 0; i < text.length(); i++) {
isB = bi.isBoundary(i);
logln((UnicodeString)"bi.isBoundary(" + i + ") -> " + isB);
@@ -1374,7 +1374,7 @@ void IntlTestTextBoundary::doBreakInvariantTest(BreakIterator& tb, UnicodeString
work[2] = testChars[k];
tb.setText(&work);
- bool_t seen2 = FALSE;
+ UBool seen2 = FALSE;
for (int l = tb.first(); l != BreakIterator::DONE; l = tb.next()) {
if (l == 2)
seen2 = TRUE;
@@ -1447,7 +1447,7 @@ void IntlTestTextBoundary::sample(BreakIterator& tb,
UnicodeString& title)
{
UnicodeString substring;
- bool_t verboseWas = verbose;
+ UBool verboseWas = verbose;
verbose = TRUE;
logln("-------------------------"+title+" length = "+text.length());
tb.setText(&text);
diff --git a/icu4c/source/test/intltest/ittxtbd.h b/icu4c/source/test/intltest/ittxtbd.h
index 73fb9538c79..6755e3f9fe6 100644
--- a/icu4c/source/test/intltest/ittxtbd.h
+++ b/icu4c/source/test/intltest/ittxtbd.h
@@ -24,7 +24,7 @@ public:
IntlTestTextBoundary();
~IntlTestTextBoundary();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* Test sentence break using generalIteratorTest()
**/
diff --git a/icu4c/source/test/intltest/itutil.cpp b/icu4c/source/test/intltest/itutil.cpp
index 29b48c3a18f..888f82300b8 100644
--- a/icu4c/source/test/intltest/itutil.cpp
+++ b/icu4c/source/test/intltest/itutil.cpp
@@ -27,7 +27,7 @@
//#include "ctres.h"
//#include "ctucd.h"
-void IntlTestUtilities::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite Utilities: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/itutil.h b/icu4c/source/test/intltest/itutil.h
index 2c86028f93e..2635f3c7c50 100644
--- a/icu4c/source/test/intltest/itutil.h
+++ b/icu4c/source/test/intltest/itutil.h
@@ -18,7 +18,7 @@
class IntlTestUtilities: public IntlTest {
public:
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
diff --git a/icu4c/source/test/intltest/jacoll.cpp b/icu4c/source/test/intltest/jacoll.cpp
index 33912f5a11b..d1a11291a47 100644
--- a/icu4c/source/test/intltest/jacoll.cpp
+++ b/icu4c/source/test/intltest/jacoll.cpp
@@ -102,7 +102,7 @@ void CollationKanaTest::TestTertiary( char* par )
}
}
-void CollationKanaTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationKanaTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationKanaTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/jacoll.h b/icu4c/source/test/intltest/jacoll.h
index 1f9e4171299..b440a5adecb 100644
--- a/icu4c/source/test/intltest/jacoll.h
+++ b/icu4c/source/test/intltest/jacoll.h
@@ -32,7 +32,7 @@ public:
CollationKanaTest();
virtual ~CollationKanaTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// main test routine, tests rules specific to "Kana" locale
void doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/jahatrts.cpp b/icu4c/source/test/intltest/jahatrts.cpp
index 867459ff2bc..f596217f0f0 100644
--- a/icu4c/source/test/intltest/jahatrts.cpp
+++ b/icu4c/source/test/intltest/jahatrts.cpp
@@ -39,7 +39,7 @@ static int32_t getInt(UnicodeString str)
// runIndexedTest
//---------------------------------------------
-void JamoToHangTransliteratorTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void JamoToHangTransliteratorTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln((UnicodeString)"TestSuite JamoToHangul Transliterator API ");
switch (index) {
@@ -59,7 +59,7 @@ class TestJamoFilter : public UnicodeFilter {
virtual UnicodeFilter* clone() const {
return new TestJamoFilter(*this);
}
- virtual bool_t contains(UChar c) const {
+ virtual UBool contains(UChar c) const {
if(c == 0x1101 )
return FALSE;
else
@@ -311,7 +311,7 @@ void JamoToHangTransliteratorTest::expect(const JamoHangulTransliterator& t,
}
void JamoToHangTransliteratorTest::expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult) {
if (pass) {
logln(UnicodeString("(")+tag+") " + prettify(summary));
diff --git a/icu4c/source/test/intltest/jahatrts.h b/icu4c/source/test/intltest/jahatrts.h
index 14e98f92a29..ef16a640f15 100644
--- a/icu4c/source/test/intltest/jahatrts.h
+++ b/icu4c/source/test/intltest/jahatrts.h
@@ -29,7 +29,7 @@ class JamoHangulTransliterator;
*/
class JamoToHangTransliteratorTest : public IntlTest {
public:
- void runIndexedTest(int32_t index, bool_t exec, char* &name, char* par=NULL);
+ void runIndexedTest(int32_t index, UBool exec, char* &name, char* par=NULL);
/*Tests the constructors */
void TestConstruction(void);
@@ -59,7 +59,7 @@ public:
const UnicodeString& expectedResult);
void expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult);
diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp
index 74152d06852..d0e87da12cc 100644
--- a/icu4c/source/test/intltest/loctest.cpp
+++ b/icu4c/source/test/intltest/loctest.cpp
@@ -146,7 +146,7 @@ LocaleTest::~LocaleTest()
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
-void LocaleTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void LocaleTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite LocaleTest: ");
switch (index) {
@@ -533,7 +533,7 @@ void LocaleTest::TestDataDirectory()
void LocaleTest::doTestDisplayNames(Locale& inLocale,
int32_t compareIndex,
- bool_t defaultIsFrench) {
+ UBool defaultIsFrench) {
UnicodeString temp;
if (defaultIsFrench && (temp=Locale::getDefault().getLanguage()) != "fr")
@@ -814,7 +814,7 @@ public void TestGetLanguagesForCountry() {
*/
/*
-private bool_t searchStringArrayFor(UnicodeString s, UnicodeString[] array) {
+private UBool searchStringArrayFor(UnicodeString s, UnicodeString[] array) {
for (int32_t i = 0; i < array.length; i++)
if (s.equals(array[i]))
return TRUE;
@@ -1021,7 +1021,7 @@ LocaleTest::TestNullDefault()
/*
// why on earth anyone would ever try to do this is beyond me, but we should
// definitely make sure we don't let them
- bool_t gotException = FALSE;
+ UBool gotException = FALSE;
try {
Locale.setDefault(null);
}
diff --git a/icu4c/source/test/intltest/loctest.h b/icu4c/source/test/intltest/loctest.h
index 9d0327a2e19..16d209897c9 100644
--- a/icu4c/source/test/intltest/loctest.h
+++ b/icu4c/source/test/intltest/loctest.h
@@ -15,7 +15,7 @@ public:
LocaleTest();
~LocaleTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* Test methods to set and get data fields
@@ -73,7 +73,7 @@ private:
/**
* routine to perform subtests, used by TestDisplayNames
**/
- void doTestDisplayNames(Locale& inLocale, int32_t compareIndex, bool_t defaultIsFrench);
+ void doTestDisplayNames(Locale& inLocale, int32_t compareIndex, UBool defaultIsFrench);
/**
* additional intialization for datatables storing expected values
**/
diff --git a/icu4c/source/test/intltest/miscdtfm.cpp b/icu4c/source/test/intltest/miscdtfm.cpp
index e59b4af25af..91f4df45f42 100644
--- a/icu4c/source/test/intltest/miscdtfm.cpp
+++ b/icu4c/source/test/intltest/miscdtfm.cpp
@@ -24,7 +24,7 @@
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
void
-DateFormatMiscTests::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+DateFormatMiscTests::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite DateFormatMiscTests");
switch (index) {
@@ -36,7 +36,7 @@ DateFormatMiscTests::runIndexedTest( int32_t index, bool_t exec, char* &name, ch
}
}
-bool_t
+UBool
DateFormatMiscTests::failure(UErrorCode status, const char* msg)
{
if(U_FAILURE(status)) {
@@ -48,7 +48,7 @@ DateFormatMiscTests::failure(UErrorCode status, const char* msg)
}
/*
- * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.8 $ $Date: 2000/04/15 21:28:17 $
+ * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.9 $ $Date: 2000/05/18 22:08:31 $
*
* @bug 4097450
*/
@@ -92,7 +92,7 @@ DateFormatMiscTests::test4097450()
UnicodeString("yyyy")
};
- bool_t dresult [] = {
+ UBool dresult [] = {
TRUE,
FALSE,
FALSE,
@@ -140,7 +140,7 @@ DateFormatMiscTests::test4097450()
}
/*
- * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.8 $ $Date: 2000/04/15 21:28:17 $
+ * @test @(#)$RCSfile: miscdtfm.cpp,v $ $Revision: 1.9 $ $Date: 2000/05/18 22:08:31 $
*
* @bug 4099975
*/
diff --git a/icu4c/source/test/intltest/miscdtfm.h b/icu4c/source/test/intltest/miscdtfm.h
index 10c9e5910e8..057f9003756 100644
--- a/icu4c/source/test/intltest/miscdtfm.h
+++ b/icu4c/source/test/intltest/miscdtfm.h
@@ -16,7 +16,7 @@
class DateFormatMiscTests : public IntlTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
void test4097450(void);
@@ -24,7 +24,7 @@ public:
void test4117335(void);
protected:
- bool_t failure(UErrorCode status, const char* msg);
+ UBool failure(UErrorCode status, const char* msg);
};
diff --git a/icu4c/source/test/intltest/mnkytst.cpp b/icu4c/source/test/intltest/mnkytst.cpp
index 7396b773a33..12dbe16b2e1 100644
--- a/icu4c/source/test/intltest/mnkytst.cpp
+++ b/icu4c/source/test/intltest/mnkytst.cpp
@@ -215,7 +215,7 @@ CollationMonkeyTest::TestCompare(char* par)
}
}
-void CollationMonkeyTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationMonkeyTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationMonkeyTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/mnkytst.h b/icu4c/source/test/intltest/mnkytst.h
index a3d8519f6f3..7ad14de4bf4 100644
--- a/icu4c/source/test/intltest/mnkytst.h
+++ b/icu4c/source/test/intltest/mnkytst.h
@@ -33,7 +33,7 @@ public:
CollationMonkeyTest();
~CollationMonkeyTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// utility function used in tests, returns absolute value
int32_t checkValue(int32_t value);
diff --git a/icu4c/source/test/intltest/msfmrgts.cpp b/icu4c/source/test/intltest/msfmrgts.cpp
index a9a03e4f121..e0bbced4088 100644
--- a/icu4c/source/test/intltest/msfmrgts.cpp
+++ b/icu4c/source/test/intltest/msfmrgts.cpp
@@ -21,7 +21,7 @@
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
void
-MessageFormatRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+MessageFormatRegressionTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite MessageFormatRegressionTest");
switch (index) {
@@ -51,7 +51,7 @@ MessageFormatRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &
}
}
-bool_t
+UBool
MessageFormatRegressionTest::failure(UErrorCode status, const char* msg)
{
if(U_FAILURE(status)) {
diff --git a/icu4c/source/test/intltest/msfmrgts.h b/icu4c/source/test/intltest/msfmrgts.h
index da8fbcb1072..7fa60531ba2 100644
--- a/icu4c/source/test/intltest/msfmrgts.h
+++ b/icu4c/source/test/intltest/msfmrgts.h
@@ -16,7 +16,7 @@
class MessageFormatRegressionTest: public IntlTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
void Test4074764(void);
@@ -42,7 +42,7 @@ public:
void Test4112104(void);
protected:
- bool_t failure(UErrorCode status, const char* msg);
+ UBool failure(UErrorCode status, const char* msg);
};
diff --git a/icu4c/source/test/intltest/nmfmapts.cpp b/icu4c/source/test/intltest/nmfmapts.cpp
index 65ca7adb242..64f96c39502 100644
--- a/icu4c/source/test/intltest/nmfmapts.cpp
+++ b/icu4c/source/test/intltest/nmfmapts.cpp
@@ -15,7 +15,7 @@
// try to test the full functionality. It just calls each function in the class and
// verifies that it works on a basic level.
-void IntlTestNumberFormatAPI::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestNumberFormatAPI::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite NumberFormatAPI");
switch (index) {
diff --git a/icu4c/source/test/intltest/nmfmapts.h b/icu4c/source/test/intltest/nmfmapts.h
index ff9961b74bc..ef315504561 100644
--- a/icu4c/source/test/intltest/nmfmapts.h
+++ b/icu4c/source/test/intltest/nmfmapts.h
@@ -16,7 +16,7 @@
* This test executes basic functionality checks of various API functions
**/
class IntlTestNumberFormatAPI: public IntlTest {
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
private:
/**
diff --git a/icu4c/source/test/intltest/nmfmtrt.cpp b/icu4c/source/test/intltest/nmfmtrt.cpp
index e0e0ddc42b7..104654297ba 100644
--- a/icu4c/source/test/intltest/nmfmtrt.cpp
+++ b/icu4c/source/test/intltest/nmfmtrt.cpp
@@ -17,17 +17,17 @@
// class NumberFormatRoundTripTest
// *****************************************************************************
-bool_t NumberFormatRoundTripTest::verbose = FALSE;
-bool_t NumberFormatRoundTripTest::STRING_COMPARE = TRUE;
-bool_t NumberFormatRoundTripTest::EXACT_NUMERIC_COMPARE = FALSE;
-bool_t NumberFormatRoundTripTest::DEBUG = FALSE;
+UBool NumberFormatRoundTripTest::verbose = FALSE;
+UBool NumberFormatRoundTripTest::STRING_COMPARE = TRUE;
+UBool NumberFormatRoundTripTest::EXACT_NUMERIC_COMPARE = FALSE;
+UBool NumberFormatRoundTripTest::DEBUG = FALSE;
double NumberFormatRoundTripTest::MAX_ERROR = 1e-14;
double NumberFormatRoundTripTest::max_numeric_error = 0.0;
double NumberFormatRoundTripTest::min_numeric_error = 1.0;
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
-void NumberFormatRoundTripTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void NumberFormatRoundTripTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite NumberFormatRoundTripTest");
switch (index) {
@@ -36,7 +36,7 @@ void NumberFormatRoundTripTest::runIndexedTest( int32_t index, bool_t exec, char
}
}
-bool_t
+UBool
NumberFormatRoundTripTest::failure(UErrorCode status, const char* msg)
{
if(U_FAILURE(status)) {
@@ -212,7 +212,7 @@ NumberFormatRoundTripTest::test(NumberFormat *fmt, const Formattable& value)
s = fmt->format(value.getLong(), s);
Formattable n;
- bool_t show = verbose;
+ UBool show = verbose;
if(DEBUG)
logln(UnicodeString(" ") + /*value.getString(temp) +*/ " F> " + escape(s));
diff --git a/icu4c/source/test/intltest/nmfmtrt.h b/icu4c/source/test/intltest/nmfmtrt.h
index 87346e2dcda..11324463148 100644
--- a/icu4c/source/test/intltest/nmfmtrt.h
+++ b/icu4c/source/test/intltest/nmfmtrt.h
@@ -20,13 +20,13 @@ class NumberFormat;
class NumberFormatRoundTripTest : public IntlTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
-static bool_t verbose;
-static bool_t STRING_COMPARE;
-static bool_t EXACT_NUMERIC_COMPARE;
-static bool_t DEBUG;
+static UBool verbose;
+static UBool STRING_COMPARE;
+static UBool EXACT_NUMERIC_COMPARE;
+static UBool DEBUG;
static double MAX_ERROR;
static double max_numeric_error;
static double min_numeric_error;
@@ -44,11 +44,11 @@ static double proportionalError(const Formattable& a, const Formattable& b);
static UnicodeString& typeOf(const Formattable& n, UnicodeString& result);
static UnicodeString& escape(UnicodeString& s);
-static bool_t
+static UBool
isDouble(const Formattable& n)
{ return (n.getType() == Formattable::kDouble); }
-static bool_t
+static UBool
isLong(const Formattable& n)
{ return (n.getType() == Formattable::kLong); }
@@ -78,7 +78,7 @@ static double randFraction()
}
protected:
- bool_t failure(UErrorCode status, const char* msg);
+ UBool failure(UErrorCode status, const char* msg);
};
diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp
index 0298d9a473d..39dda9fffe7 100644
--- a/icu4c/source/test/intltest/numfmtst.cpp
+++ b/icu4c/source/test/intltest/numfmtst.cpp
@@ -22,7 +22,7 @@
#define CHECK(status,str) if (U_FAILURE(status)) { errln(UnicodeString("FAIL: ") + str); return; }
-void NumberFormatTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void NumberFormatTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite DateFormatTest");
switch (index) {
@@ -189,7 +189,7 @@ NumberFormatTest::TestExponential(void)
Formattable af;
fmt.parse(s, af, pos);
double a;
- bool_t useEpsilon = FALSE;
+ UBool useEpsilon = FALSE;
if (af.getType() == Formattable::kLong) a = af.getLong();
else if (af.getType() == Formattable::kDouble) {
a = af.getDouble();
diff --git a/icu4c/source/test/intltest/numfmtst.h b/icu4c/source/test/intltest/numfmtst.h
index 6ef637479a9..e1e74939a85 100644
--- a/icu4c/source/test/intltest/numfmtst.h
+++ b/icu4c/source/test/intltest/numfmtst.h
@@ -17,7 +17,7 @@ class DecimalFormat;
**/
class NumberFormatTest: public CalendarTimeZoneTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
/*
* Test the handling of quotes
diff --git a/icu4c/source/test/intltest/numrgts.cpp b/icu4c/source/test/intltest/numrgts.cpp
index f38e9126d14..078d0e9f768 100644
--- a/icu4c/source/test/intltest/numrgts.cpp
+++ b/icu4c/source/test/intltest/numrgts.cpp
@@ -23,7 +23,7 @@
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
void
-NumberFormatRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+NumberFormatRegressionTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite NumberFormatRegressionTest");
switch (index) {
@@ -92,7 +92,7 @@ NumberFormatRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &n
}
}
-bool_t
+UBool
NumberFormatRegressionTest::failure(UErrorCode status, const UnicodeString& msg)
{
if(U_FAILURE(status)) {
diff --git a/icu4c/source/test/intltest/numrgts.h b/icu4c/source/test/intltest/numrgts.h
index a9e14be27a1..d2d3865b549 100644
--- a/icu4c/source/test/intltest/numrgts.h
+++ b/icu4c/source/test/intltest/numrgts.h
@@ -22,7 +22,7 @@ class DecimalFormat;
class NumberFormatRegressionTest: public IntlTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
void Test4075713(void);
@@ -91,7 +91,7 @@ public:
void Test4243108(void);
protected:
- bool_t failure(UErrorCode status, const UnicodeString& msg);
+ UBool failure(UErrorCode status, const UnicodeString& msg);
};
class MyNumberFormatTest : public NumberFormat
diff --git a/icu4c/source/test/intltest/pptest.cpp b/icu4c/source/test/intltest/pptest.cpp
index 18e9a0baa55..ede37a3a9eb 100644
--- a/icu4c/source/test/intltest/pptest.cpp
+++ b/icu4c/source/test/intltest/pptest.cpp
@@ -15,7 +15,7 @@
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
-void ParsePositionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void ParsePositionTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite ParsePositionTest");
switch (index) {
@@ -28,7 +28,7 @@ void ParsePositionTest::runIndexedTest( int32_t index, bool_t exec, char* &name,
}
}
-bool_t
+UBool
ParsePositionTest::failure(UErrorCode status, const char* msg)
{
if(U_FAILURE(status)) {
@@ -103,9 +103,9 @@ void ParsePositionTest::TestFieldPosition()
if ( fph.getField() != 3)
errln("*** FP getField or heap constr.");
- bool_t err1 = FALSE;
- bool_t err2 = FALSE;
- bool_t err3 = FALSE;
+ UBool err1 = FALSE;
+ UBool err2 = FALSE;
+ UBool err3 = FALSE;
// for (long i = -50; i < 50; i++ ) {
// fp.setField( i+8 );
// fp.setBeginIndex( i+6 );
diff --git a/icu4c/source/test/intltest/pptest.h b/icu4c/source/test/intltest/pptest.h
index 7a57387aa9d..aee6de40968 100644
--- a/icu4c/source/test/intltest/pptest.h
+++ b/icu4c/source/test/intltest/pptest.h
@@ -16,7 +16,7 @@
**/
class ParsePositionTest: public IntlTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
void TestParsePosition(void);
@@ -25,7 +25,7 @@ public:
void Test4109023(void);
protected:
- bool_t failure(UErrorCode status, const char* msg);
+ UBool failure(UErrorCode status, const char* msg);
};
#endif // _PARSEPOSITIONIONTEST_
diff --git a/icu4c/source/test/intltest/rbbiapts.cpp b/icu4c/source/test/intltest/rbbiapts.cpp
index 2ddae4f031e..fc690a7cf10 100644
--- a/icu4c/source/test/intltest/rbbiapts.cpp
+++ b/icu4c/source/test/intltest/rbbiapts.cpp
@@ -534,7 +534,7 @@ void RBBIAPITest::TestIsBoundary(){
// runIndexedTest
//---------------------------------------------
-void RBBIAPITest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void RBBIAPITest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln((UnicodeString)"TestSuite RuleBasedBreakIterator API ");
switch (index) {
@@ -558,7 +558,7 @@ void RBBIAPITest::runIndexedTest( int32_t index, bool_t exec, char* &name, char*
void RBBIAPITest::doBoundaryTest(RuleBasedBreakIterator& bi, UnicodeString& text, int32_t *boundaries){
logln((UnicodeString)"testIsBoundary():");
int32_t p = 0;
- bool_t isB;
+ UBool isB;
for (int32_t i = 0; i < text.length(); i++) {
isB = bi.isBoundary(i);
logln((UnicodeString)"bi.isBoundary(" + i + ") -> " + isB);
diff --git a/icu4c/source/test/intltest/rbbiapts.h b/icu4c/source/test/intltest/rbbiapts.h
index 2ce9e94028e..d8482751dfe 100644
--- a/icu4c/source/test/intltest/rbbiapts.h
+++ b/icu4c/source/test/intltest/rbbiapts.h
@@ -25,7 +25,7 @@ class RBBIAPITest: public IntlTest {
public:
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* Tests Constructor behaviour of RuleBasedBreakIterator
**/
diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp
index 93482b9177b..f1d630e34f1 100644
--- a/icu4c/source/test/intltest/rbbitst.cpp
+++ b/icu4c/source/test/intltest/rbbitst.cpp
@@ -28,7 +28,7 @@
*/
class Enumeration { // text enumeration
public:
- virtual bool_t hasMoreElements() = 0;
+ virtual UBool hasMoreElements() = 0;
virtual UnicodeString nextElement() = 0;
};
@@ -54,7 +54,7 @@ public:
public:
VectorEnumeration(Vector* vector) : fVector(vector), fPos(&vector->fBase) {}
- bool_t hasMoreElements() { return fPos->fLink != &fVector->fBase; }
+ UBool hasMoreElements() { return fPos->fLink != &fVector->fBase; }
UnicodeString nextElement() { fPos = fPos->fLink; return fPos->fText; }
Vector* fVector;
@@ -915,7 +915,7 @@ void RBBITest::TestAbbrRuleBasedWordIteration()
// runIndexedTest
//---------------------------------------------
-void RBBITest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void RBBITest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite RuleBasedBreakIterator: ");
switch (index) {
@@ -1154,7 +1154,7 @@ void RBBITest::testPreceding(RuleBasedBreakIterator& bi, UnicodeString& text, in
void RBBITest::testIsBoundary(RuleBasedBreakIterator& bi, UnicodeString& text, int32_t *boundaries) {
logln("testIsBoundary():");
int p = 1;
- bool_t isB;
+ UBool isB;
for (int i = 0; i < text.length(); i++) {
isB = bi.isBoundary(i);
logln((UnicodeString)"bi.isBoundary(" + i + ") -> " + isB);
diff --git a/icu4c/source/test/intltest/rbbitst.h b/icu4c/source/test/intltest/rbbitst.h
index 0b7c5c564f4..456e3cd300e 100644
--- a/icu4c/source/test/intltest/rbbitst.h
+++ b/icu4c/source/test/intltest/rbbitst.h
@@ -27,7 +27,7 @@ class Enumeration;
class RBBITest: public IntlTest {
public:
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* Tests default rules based character iteration
**/
diff --git a/icu4c/source/test/intltest/regcoll.cpp b/icu4c/source/test/intltest/regcoll.cpp
index 3fd33464e90..a499c629575 100644
--- a/icu4c/source/test/intltest/regcoll.cpp
+++ b/icu4c/source/test/intltest/regcoll.cpp
@@ -1162,7 +1162,7 @@ void CollationRegressionTest::assertEqual(CollationElementIterator &i1, Collatio
while (c1 != CollationElementIterator::NULLORDER);
}
-void CollationRegressionTest::runIndexedTest(int32_t index, bool_t exec, char* &name, char* par)
+void CollationRegressionTest::runIndexedTest(int32_t index, UBool exec, char* &name, char* par)
{
if (exec)
{
diff --git a/icu4c/source/test/intltest/regcoll.h b/icu4c/source/test/intltest/regcoll.h
index 3128b7a470f..9cc98a06799 100644
--- a/icu4c/source/test/intltest/regcoll.h
+++ b/icu4c/source/test/intltest/regcoll.h
@@ -41,7 +41,7 @@ public:
CollationRegressionTest();
virtual ~CollationRegressionTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// @bug 4048446
//
diff --git a/icu4c/source/test/intltest/restest.cpp b/icu4c/source/test/intltest/restest.cpp
index 3c2a406d7c5..ef3ceb53e5c 100644
--- a/icu4c/source/test/intltest/restest.cpp
+++ b/icu4c/source/test/intltest/restest.cpp
@@ -97,8 +97,8 @@ struct
Locale *locale;
UErrorCode expected_constructor_status;
E_Where where;
- bool_t like[e_Where_count];
- bool_t inherits[e_Where_count];
+ UBool like[e_Where_count];
+ UBool inherits[e_Where_count];
}
param[] =
{
@@ -125,7 +125,7 @@ int32_t bundles_count = sizeof(param) / sizeof(param[0]);
uint32_t
randul()
{
- static bool_t initialized = FALSE;
+ static UBool initialized = FALSE;
if (!initialized)
{
srand((unsigned)time(NULL));
@@ -173,7 +173,7 @@ ResourceBundleTest::~ResourceBundleTest()
{
}
-void ResourceBundleTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void ResourceBundleTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite ResourceBundleTest: ");
switch (index) {
@@ -328,17 +328,17 @@ ResourceBundleTest::TestConstruction()
//***************************************************************************************
-bool_t
+UBool
ResourceBundleTest::testTag(const char* frag,
- bool_t in_Root,
- bool_t in_te,
- bool_t in_te_IN)
+ UBool in_Root,
+ UBool in_te,
+ UBool in_te_IN)
{
- bool_t pass=TRUE;
+ UBool pass=TRUE;
// Make array from input params
- bool_t is_in[] = { in_Root, in_te, in_te_IN };
+ UBool is_in[] = { in_Root, in_te, in_te_IN };
const char* NAME[] = { "ROOT", "TE", "TE_IN" };
diff --git a/icu4c/source/test/intltest/restest.h b/icu4c/source/test/intltest/restest.h
index 71470dde8f2..918bf08e7df 100644
--- a/icu4c/source/test/intltest/restest.h
+++ b/icu4c/source/test/intltest/restest.h
@@ -14,7 +14,7 @@ public:
ResourceBundleTest();
~ResourceBundleTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* Perform several extensive tests using the subtest routine testTag
@@ -29,7 +29,7 @@ private:
/**
* extensive subtests called by TestResourceBundles
**/
- bool_t testTag(const char* frag, bool_t in_Root, bool_t in_te, bool_t in_te_IN);
+ UBool testTag(const char* frag, UBool in_Root, UBool in_te, UBool in_te_IN);
void record_pass(void);
void record_fail(void);
diff --git a/icu4c/source/test/intltest/restsnew.cpp b/icu4c/source/test/intltest/restsnew.cpp
index 9260029a2b5..130bf40cadd 100644
--- a/icu4c/source/test/intltest/restsnew.cpp
+++ b/icu4c/source/test/intltest/restsnew.cpp
@@ -97,8 +97,8 @@ static struct
Locale *locale;
UErrorCode expected_constructor_status;
E_Where where;
- bool_t like[e_Where_count];
- bool_t inherits[e_Where_count];
+ UBool like[e_Where_count];
+ UBool inherits[e_Where_count];
}
param[] =
{
@@ -125,7 +125,7 @@ static int32_t bundles_count = sizeof(param) / sizeof(param[0]);
static uint32_t
randul()
{
- static bool_t initialized = FALSE;
+ static UBool initialized = FALSE;
if (!initialized)
{
srand((unsigned)time(NULL));
@@ -173,7 +173,7 @@ NewResourceBundleTest::~NewResourceBundleTest()
{
}
-void NewResourceBundleTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void NewResourceBundleTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite ResourceBundleTest: ");
switch (index) {
@@ -439,17 +439,17 @@ NewResourceBundleTest::TestIteration()
//***************************************************************************************
-bool_t
+UBool
NewResourceBundleTest::testTag(const char* frag,
- bool_t in_Root,
- bool_t in_te,
- bool_t in_te_IN)
+ UBool in_Root,
+ UBool in_te,
+ UBool in_te_IN)
{
- bool_t pass=TRUE;
+ UBool pass=TRUE;
// Make array from input params
- bool_t is_in[] = { in_Root, in_te, in_te_IN };
+ UBool is_in[] = { in_Root, in_te, in_te_IN };
const char* NAME[] = { "ROOT", "TE", "TE_IN" };
diff --git a/icu4c/source/test/intltest/restsnew.h b/icu4c/source/test/intltest/restsnew.h
index 7fde03f6248..0307c670388 100644
--- a/icu4c/source/test/intltest/restsnew.h
+++ b/icu4c/source/test/intltest/restsnew.h
@@ -14,7 +14,7 @@ public:
NewResourceBundleTest();
~NewResourceBundleTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* Perform several extensive tests using the subtest routine testTag
@@ -31,7 +31,7 @@ private:
/**
* extensive subtests called by TestResourceBundles
**/
- bool_t testTag(const char* frag, bool_t in_Root, bool_t in_te, bool_t in_te_IN);
+ UBool testTag(const char* frag, UBool in_Root, UBool in_te, UBool in_te_IN);
void record_pass(void);
void record_fail(void);
diff --git a/icu4c/source/test/intltest/sdtfmtts.cpp b/icu4c/source/test/intltest/sdtfmtts.cpp
index edb55c2d797..a1084851e9e 100644
--- a/icu4c/source/test/intltest/sdtfmtts.cpp
+++ b/icu4c/source/test/intltest/sdtfmtts.cpp
@@ -15,7 +15,7 @@
// try to test the full functionality. It just calls each function in the class and
// verifies that it works on a basic level.
-void IntlTestSimpleDateFormatAPI::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestSimpleDateFormatAPI::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite SimpleDateFormatAPI");
switch (index) {
diff --git a/icu4c/source/test/intltest/sdtfmtts.h b/icu4c/source/test/intltest/sdtfmtts.h
index 6cf7953330a..c52a328ee4e 100644
--- a/icu4c/source/test/intltest/sdtfmtts.h
+++ b/icu4c/source/test/intltest/sdtfmtts.h
@@ -15,7 +15,7 @@
* Test basic functionality of various API functions
**/
class IntlTestSimpleDateFormatAPI : public IntlTest {
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
private:
/**
diff --git a/icu4c/source/test/intltest/strtest.cpp b/icu4c/source/test/intltest/strtest.cpp
index 0df7745a3fc..4aae18ff364 100644
--- a/icu4c/source/test/intltest/strtest.cpp
+++ b/icu4c/source/test/intltest/strtest.cpp
@@ -46,7 +46,7 @@ void StringTest::TestCharsetFamily(void) {
U_STRING_DECL(ustringVar, "aZ0 -", 5);
-void StringTest::runIndexedTest(int32_t index, bool_t exec, char *&name, char *par) {
+void StringTest::runIndexedTest(int32_t index, UBool exec, char *&name, char *par) {
if(exec) {
logln("TestSuite Character and String Test: ");
}
diff --git a/icu4c/source/test/intltest/strtest.h b/icu4c/source/test/intltest/strtest.h
index cfa64fd611e..8210d1b1686 100644
--- a/icu4c/source/test/intltest/strtest.h
+++ b/icu4c/source/test/intltest/strtest.h
@@ -28,7 +28,7 @@ public:
StringTest() {}
~StringTest() {}
- void runIndexedTest(int32_t index, bool_t exec, char *&name, char *par=NULL);
+ void runIndexedTest(int32_t index, UBool exec, char *&name, char *par=NULL);
private:
void TestEndian(void);
diff --git a/icu4c/source/test/intltest/tchcfmt.cpp b/icu4c/source/test/intltest/tchcfmt.cpp
index 2055c35b217..e2a2d2ef5eb 100644
--- a/icu4c/source/test/intltest/tchcfmt.cpp
+++ b/icu4c/source/test/intltest/tchcfmt.cpp
@@ -18,9 +18,9 @@
// tests have obvious memory leaks!
-static bool_t chkstatus( UErrorCode &status, char* msg = NULL )
+static UBool chkstatus( UErrorCode &status, char* msg = NULL )
{
- bool_t ok = U_SUCCESS(status);
+ UBool ok = U_SUCCESS(status);
if (!ok) it_errln( msg );
return ok;
}
@@ -261,7 +261,7 @@ TestChoiceFormat::TestComplexExample( void )
}
ChoiceFormat form_Assigned( *form_A );
- bool_t ok = (form_Assigned == *form_A) && (form_Assigned != *form_B);
+ UBool ok = (form_Assigned == *form_A) && (form_Assigned != *form_B);
form_Assigned = *form_B;
ok = ok && (form_Assigned != *form_A) && (form_Assigned == *form_B);
if (ok) {
@@ -572,7 +572,7 @@ TestChoiceFormat::testValue( double val )
}
-void TestChoiceFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void TestChoiceFormat::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
switch (index) {
case 0: name = "TestSimpleExample";
diff --git a/icu4c/source/test/intltest/tchcfmt.h b/icu4c/source/test/intltest/tchcfmt.h
index 72f4d4691be..f5651929f61 100644
--- a/icu4c/source/test/intltest/tchcfmt.h
+++ b/icu4c/source/test/intltest/tchcfmt.h
@@ -44,5 +44,5 @@ class TestChoiceFormat: public IntlTest {
/**
* runs tests in local funtions:
**/
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
diff --git a/icu4c/source/test/intltest/tfsmalls.cpp b/icu4c/source/test/intltest/tfsmalls.cpp
index cc047c6b4bc..3e6f4ca7582 100644
--- a/icu4c/source/test/intltest/tfsmalls.cpp
+++ b/icu4c/source/test/intltest/tfsmalls.cpp
@@ -19,9 +19,9 @@
#include "unicode/fmtable.h"
-static bool_t chkstatus( UErrorCode &status, char* msg = NULL )
+static UBool chkstatus( UErrorCode &status, char* msg = NULL )
{
- bool_t ok = (status == U_ZERO_ERROR);
+ UBool ok = (status == U_ZERO_ERROR);
if (!ok) it_errln( msg );
return ok;
}
@@ -124,9 +124,9 @@ void test_FieldPosition( void )
if ( fph->getField() != 3) it_errln("*** FP getField or heap constr.");
delete fph;
- bool_t err1 = FALSE;
- bool_t err2 = FALSE;
- bool_t err3 = FALSE;
+ UBool err1 = FALSE;
+ UBool err2 = FALSE;
+ UBool err3 = FALSE;
for (int32_t i = -50; i < 50; i++ ) {
fp.setField( i+8 );
fp.setBeginIndex( i+6 );
@@ -229,7 +229,7 @@ void test_Formattable( void )
int32_t res_cnt;
const Formattable* res_array = ft_arr.getArray( res_cnt );
if (res_cnt == ft_cnt) {
- bool_t same = TRUE;
+ UBool same = TRUE;
for (int32_t i = 0; i < res_cnt; i++ ) {
if (res_array[i] != ftarray[i]) {
same = FALSE;
@@ -294,7 +294,7 @@ void test_Formattable( void )
}
-void TestFormatSmallClasses::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void TestFormatSmallClasses::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
switch (index) {
case 0: name = "pp";
diff --git a/icu4c/source/test/intltest/tfsmalls.h b/icu4c/source/test/intltest/tfsmalls.h
index f1f9ead0e9b..b38307ecb27 100644
--- a/icu4c/source/test/intltest/tfsmalls.h
+++ b/icu4c/source/test/intltest/tfsmalls.h
@@ -23,5 +23,5 @@ class TestFormatSmallClasses: public IntlTest {
* FieldPosition in test_FieldPosition(),
* Formattable in test_Formattable().
**/
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
diff --git a/icu4c/source/test/intltest/thcoll.cpp b/icu4c/source/test/intltest/thcoll.cpp
index e76b8d16e9b..3e3584033fe 100644
--- a/icu4c/source/test/intltest/thcoll.cpp
+++ b/icu4c/source/test/intltest/thcoll.cpp
@@ -52,7 +52,7 @@ CollationThaiTest::~CollationThaiTest() {
delete coll;
}
-void CollationThaiTest::runIndexedTest(int32_t index, bool_t exec, char* &name,
+void CollationThaiTest::runIndexedTest(int32_t index, UBool exec, char* &name,
char* par) {
switch (index) {
CASE(0,TestDictionary)
@@ -67,7 +67,7 @@ void CollationThaiTest::runIndexedTest(int32_t index, bool_t exec, char* &name,
* characters long or less. This is true for th18057.txt, which
* has 80-char or shorter lines. DOES NOT HANDLE ^M^J sequence.
*/
-static bool_t readLine(FileStream *in, UnicodeString& line) {
+static UBool readLine(FileStream *in, UnicodeString& line) {
if (T_FileStream_eof(in)) {
return FALSE;
}
diff --git a/icu4c/source/test/intltest/thcoll.h b/icu4c/source/test/intltest/thcoll.h
index 586d65596a1..72ea649a94e 100644
--- a/icu4c/source/test/intltest/thcoll.h
+++ b/icu4c/source/test/intltest/thcoll.h
@@ -21,7 +21,7 @@ public:
CollationThaiTest();
virtual ~CollationThaiTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
private:
diff --git a/icu4c/source/test/intltest/tmsgfmt.cpp b/icu4c/source/test/intltest/tmsgfmt.cpp
index 2ac6836bcbf..18143f1d511 100644
--- a/icu4c/source/test/intltest/tmsgfmt.cpp
+++ b/icu4c/source/test/intltest/tmsgfmt.cpp
@@ -305,7 +305,7 @@ void TestMessageFormat::PatternTest()
if (count != 4) {
errln("MSG count not 4 (as expected)");
}
- bool_t failed = FALSE;
+ UBool failed = FALSE;
for (int32_t j = 0; j < count; ++j) {
if (values == 0 || testArgs[j] != values[j]) {
it_out << "MSG testargs[" << j << "]: " << testArgs[j] << endl;
@@ -625,7 +625,7 @@ void TestMessageFormat::testSetLocale()
}
msg.setLocale(Locale::ENGLISH);
- bool_t getLocale_ok = TRUE;
+ UBool getLocale_ok = TRUE;
if (msg.getLocale() != Locale::ENGLISH) {
it_errln("*** MSG getLocal err.");
getLocale_ok = FALSE;
@@ -817,14 +817,14 @@ void TestMessageFormat::testAdopt()
UnicodeString patAct;
Format** formatsToAdopt;
- bool_t ok = FALSE;
+ UBool ok = FALSE;
if (!formats || !formatsCmp || (count <= 0) || (count != countCmp)) {
goto endtest;
}
int32_t i;
- bool_t equal;
+ UBool equal;
equal = TRUE;
for (i = 0; i < count; i++) {
a = formats[i];
@@ -844,7 +844,7 @@ void TestMessageFormat::testAdopt()
formatsChg = msg.getFormats(countChg); // tested function
if (!formatsChg || (countChg != count)) goto endtest;
- bool_t diff;
+ UBool diff;
diff = TRUE;
for (i = 0; i < count; i++) {
a = formatsChg[i];
@@ -1036,7 +1036,7 @@ static void testCopyConstructor2()
}
-void TestMessageFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, char* parm )
+void TestMessageFormat::runIndexedTest( int32_t index, UBool exec, char* &name, char* parm )
{
if (exec) logln("TestSuite MessageFormat");
diff --git a/icu4c/source/test/intltest/tmsgfmt.h b/icu4c/source/test/intltest/tmsgfmt.h
index bb1ceca3fd4..350df8fc59e 100644
--- a/icu4c/source/test/intltest/tmsgfmt.h
+++ b/icu4c/source/test/intltest/tmsgfmt.h
@@ -19,7 +19,7 @@ class UnicodeString;
*/
class TestMessageFormat: public IntlTest {
public:
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* regression test for a specific bug regarding ChoiceFormat boundaries
diff --git a/icu4c/source/test/intltest/transapi.cpp b/icu4c/source/test/intltest/transapi.cpp
index 454620f8328..38a39be8e6c 100644
--- a/icu4c/source/test/intltest/transapi.cpp
+++ b/icu4c/source/test/intltest/transapi.cpp
@@ -35,7 +35,7 @@ int32_t getInt(UnicodeString str)
// runIndexedTest
//---------------------------------------------
-void TransliteratorAPITest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void TransliteratorAPITest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln((UnicodeString)"TestSuite Transliterator API ");
switch (index) {
@@ -528,7 +528,7 @@ class TestFilter1 : public UnicodeFilter {
virtual UnicodeFilter* clone() const {
return new TestFilter1(*this);
}
- virtual bool_t contains(UChar c) const {
+ virtual UBool contains(UChar c) const {
if(c==0x63 || c==0x61 || c==0x43 || c==0x41)
return FALSE;
else
@@ -539,7 +539,7 @@ class TestFilter2 : public UnicodeFilter {
virtual UnicodeFilter* clone() const {
return new TestFilter2(*this);
}
- virtual bool_t contains(UChar c) const {
+ virtual UBool contains(UChar c) const {
if(c==0x65 || c==0x6c)
return FALSE;
else
@@ -550,7 +550,7 @@ class TestFilter3 : public UnicodeFilter {
virtual UnicodeFilter* clone() const {
return new TestFilter3(*this);
}
- virtual bool_t contains(UChar c) const {
+ virtual UBool contains(UChar c) const {
if(c==0x6f || c==0x77)
return FALSE;
else
diff --git a/icu4c/source/test/intltest/transapi.h b/icu4c/source/test/intltest/transapi.h
index ba781e635ad..ccc963e45ac 100644
--- a/icu4c/source/test/intltest/transapi.h
+++ b/icu4c/source/test/intltest/transapi.h
@@ -23,7 +23,7 @@ class Transliterator;
*/
class TransliteratorAPITest : public IntlTest {
public:
- void runIndexedTest(int32_t index, bool_t exec, char* &name, char* par=NULL);
+ void runIndexedTest(int32_t index, UBool exec, char* &name, char* par=NULL);
/*Tests the function getDisplayName() */
void TestGetDisplayName();
diff --git a/icu4c/source/test/intltest/transtst.cpp b/icu4c/source/test/intltest/transtst.cpp
index a2db8c85da7..769bd93a199 100644
--- a/icu4c/source/test/intltest/transtst.cpp
+++ b/icu4c/source/test/intltest/transtst.cpp
@@ -37,7 +37,7 @@ enum {
break
void
-TransliteratorTest::runIndexedTest(int32_t index, bool_t exec,
+TransliteratorTest::runIndexedTest(int32_t index, UBool exec,
char* &name, char* par) {
switch (index) {
CASE(0,TestInstantiation);
@@ -442,7 +442,7 @@ class TestFilter : public UnicodeFilter {
virtual UnicodeFilter* clone() const {
return new TestFilter(*this);
}
- virtual bool_t contains(UChar c) const {
+ virtual UBool contains(UChar c) const {
return c != (UChar)0x0063 /*c*/;
}
};
@@ -548,7 +548,7 @@ void TransliteratorTest::TestJ277(void) {
}
UnicodeString out(data[i]);
gl->transliterate(out);
- bool_t ok = TRUE;
+ UBool ok = TRUE;
if (data[i].length() >= 2 && out.length() >= 2 &&
u_isupper(data[i].charAt(0)) && u_islower(data[i].charAt(1))) {
if (!(u_isupper(out.charAt(0)) && u_islower(out.charAt(1)))) {
@@ -594,7 +594,7 @@ void TransliteratorTest::TestJ243(void) {
*/
void TransliteratorTest::TestJ329(void) {
- struct { bool_t containsErrors; const char* rule; } DATA[] = {
+ struct { UBool containsErrors; const char* rule; } DATA[] = {
{ FALSE, "a > b; c > d" },
{ TRUE, "a > b; no operator; c > d" },
};
@@ -609,7 +609,7 @@ void TransliteratorTest::TestJ329(void) {
0,
parseError,
status);
- bool_t gotError = U_FAILURE(status);
+ UBool gotError = U_FAILURE(status);
UnicodeString desc(DATA[i].rule);
desc.append(gotError ? " -> error" : " -> no error");
if (gotError) {
@@ -703,7 +703,7 @@ void TransliteratorTest::expectAux(const UnicodeString& tag,
}
void TransliteratorTest::expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult) {
if (pass) {
logln(UnicodeString("(")+tag+") " + prettify(summary));
diff --git a/icu4c/source/test/intltest/transtst.h b/icu4c/source/test/intltest/transtst.h
index c0f97d51751..1205033729a 100644
--- a/icu4c/source/test/intltest/transtst.h
+++ b/icu4c/source/test/intltest/transtst.h
@@ -21,7 +21,7 @@ class Transliterator;
*/
class TransliteratorTest : public IntlTest {
- void runIndexedTest(int32_t index, bool_t exec, char* &name,
+ void runIndexedTest(int32_t index, UBool exec, char* &name,
char* par=NULL);
#if 0
void TestHashtable(void);
@@ -118,7 +118,7 @@ class TransliteratorTest : public IntlTest {
const UnicodeString& expectedResult);
void expectAux(const UnicodeString& tag,
- const UnicodeString& summary, bool_t pass,
+ const UnicodeString& summary, UBool pass,
const UnicodeString& expectedResult);
};
diff --git a/icu4c/source/test/intltest/trcoll.cpp b/icu4c/source/test/intltest/trcoll.cpp
index b6ecb256d3f..14f489b21ab 100644
--- a/icu4c/source/test/intltest/trcoll.cpp
+++ b/icu4c/source/test/intltest/trcoll.cpp
@@ -110,7 +110,7 @@ void CollationTurkishTest::TestPrimary( char* par )
}
}
-void CollationTurkishTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void CollationTurkishTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite CollationTurkishTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/trcoll.h b/icu4c/source/test/intltest/trcoll.h
index efe15e97b89..beb3bc9362c 100644
--- a/icu4c/source/test/intltest/trcoll.h
+++ b/icu4c/source/test/intltest/trcoll.h
@@ -31,7 +31,7 @@ public:
CollationTurkishTest();
virtual ~CollationTurkishTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
// main test routine, tests rules specific to turkish locale
void doTest( UnicodeString source, UnicodeString target, Collator::EComparisonResult result);
diff --git a/icu4c/source/test/intltest/tscoll.cpp b/icu4c/source/test/intltest/tscoll.cpp
index d60a1a6a82f..f4510ade377 100644
--- a/icu4c/source/test/intltest/tscoll.cpp
+++ b/icu4c/source/test/intltest/tscoll.cpp
@@ -30,7 +30,7 @@
#include "tstnorm.h"
#include "thcoll.h"
-void IntlTestCollator::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestCollator::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec)
{
diff --git a/icu4c/source/test/intltest/tscoll.h b/icu4c/source/test/intltest/tscoll.h
index 1fff733c48b..026063b7171 100644
--- a/icu4c/source/test/intltest/tscoll.h
+++ b/icu4c/source/test/intltest/tscoll.h
@@ -17,7 +17,7 @@
class IntlTestCollator: public IntlTest {
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
};
diff --git a/icu4c/source/test/intltest/tsdate.cpp b/icu4c/source/test/intltest/tsdate.cpp
index 32bfc8a0439..f65637823f4 100644
--- a/icu4c/source/test/intltest/tsdate.cpp
+++ b/icu4c/source/test/intltest/tsdate.cpp
@@ -19,7 +19,7 @@ const double IntlTestDateFormat::ONEYEAR = 365.25 * ONEDAY; // Approximate
* DateFormat.
*/
// par is ignored throughout this file
-void IntlTestDateFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestDateFormat::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite DateFormat");
switch (index) {
@@ -141,7 +141,7 @@ void IntlTestDateFormat::tryDate(UDate theDate)
int32_t dateMatch = 0;
int32_t stringMatch = 0;
- bool_t dump = FALSE;
+ UBool dump = FALSE;
int32_t i;
for (i=0; i 0); }
- bool_t getError(UnicodeString& fillinError) { fillinError = fErrorString; return (fErrors > 0); }
+ UBool getDone() { return fDone; }
+ UBool getError() { return (fErrors > 0); }
+ UBool getError(UnicodeString& fillinError) { fillinError = fErrorString; return (fErrors > 0); }
virtual ~ThreadWithStatus(){}
protected:
ThreadWithStatus() : fDone(FALSE), fErrors(0) {}
@@ -508,7 +508,7 @@ protected:
void error(const UnicodeString &error) { fErrors++; fErrorString = error; done(); }
void error() { error("An error occured."); }
private:
- bool_t fDone;
+ UBool fDone;
int32_t fErrors;
UnicodeString fErrorString;
};
diff --git a/icu4c/source/test/intltest/tsmthred.h b/icu4c/source/test/intltest/tsmthred.h
index ed9f5f464dc..bab06484772 100644
--- a/icu4c/source/test/intltest/tsmthred.h
+++ b/icu4c/source/test/intltest/tsmthred.h
@@ -38,7 +38,7 @@ public:
MultithreadTest();
~MultithreadTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* test that threads even work
diff --git a/icu4c/source/test/intltest/tsmutex.cpp b/icu4c/source/test/intltest/tsmutex.cpp
index f0ef31b1aff..9785b3fd575 100644
--- a/icu4c/source/test/intltest/tsmutex.cpp
+++ b/icu4c/source/test/intltest/tsmutex.cpp
@@ -53,7 +53,7 @@ MutexTest::MutexTest() {
MutexTest::~MutexTest() {
}
-void MutexTest::runIndexedTest( int32_t index, bool_t exec,
+void MutexTest::runIndexedTest( int32_t index, UBool exec,
char* &name, char* par ) {
if (exec) logln("TestSuite MutexTest: ");
switch (index) {
diff --git a/icu4c/source/test/intltest/tsmutex.h b/icu4c/source/test/intltest/tsmutex.h
index aad310ef037..136533871ab 100644
--- a/icu4c/source/test/intltest/tsmutex.h
+++ b/icu4c/source/test/intltest/tsmutex.h
@@ -21,7 +21,7 @@ public:
MutexTest();
~MutexTest();
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par = NULL );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par = NULL );
/**
* test the Mutex functionality and API using subroutine TestLock
diff --git a/icu4c/source/test/intltest/tsnmfmt.cpp b/icu4c/source/test/intltest/tsnmfmt.cpp
index dcf51a9767c..932f5cfc144 100644
--- a/icu4c/source/test/intltest/tsnmfmt.cpp
+++ b/icu4c/source/test/intltest/tsnmfmt.cpp
@@ -17,7 +17,7 @@
* This test does round-trip testing (format -> parse -> format -> parse -> etc.) of
* NumberFormat.
*/
-void IntlTestNumberFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void IntlTestNumberFormat::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln((UnicodeString)"TestSuite NumberFormat");
@@ -215,7 +215,7 @@ IntlTestNumberFormat::tryIt(double aNumber)
int32_t numberMatch = 0;
int32_t stringMatch = 0;
- bool_t dump = FALSE;
+ UBool dump = FALSE;
int32_t i;
for (i=0; i INTERVAL) {
UDate mid = (min + max) / 2;
- bool_t isIn = tz->inDaylightTime(mid, status);
+ UBool isIn = tz->inDaylightTime(mid, status);
if (failure(status, "TimeZone::inDaylightTime")) return;
if (isIn == startsInDST) {
min = mid;
@@ -179,7 +179,7 @@ TimeZoneBoundaryTest::showNN(int32_t n)
// -------------------------------------
void
-TimeZoneBoundaryTest::verifyDST(UDate d, TimeZone* time_zone, bool_t expUseDaylightTime, bool_t expInDaylightTime, UDate expZoneOffset, UDate expDSTOffset)
+TimeZoneBoundaryTest::verifyDST(UDate d, TimeZone* time_zone, UBool expUseDaylightTime, UBool expInDaylightTime, UDate expZoneOffset, UDate expDSTOffset)
{
UnicodeString str;
UErrorCode status = U_ZERO_ERROR;
@@ -220,7 +220,7 @@ TimeZoneBoundaryTest::TestBoundaries()
UDate d = date(97, Calendar::APRIL, 6);
TimeZone *z = TimeZone::createTimeZone("PST");
for (int32_t i = 60; i <= 180; i += 15) {
- bool_t inDST = (i >= 120);
+ UBool inDST = (i >= 120);
UDate e = d + i * 60 * 1000;
verifyDST(e, z, TRUE, inDST, - 8 * ONE_HOUR, inDST ? - 7 * ONE_HOUR: - 8 * ONE_HOUR);
}
@@ -271,7 +271,7 @@ TimeZoneBoundaryTest::testUsingBinarySearch(SimpleTimeZone* tz, UDate d, UDate e
UErrorCode status = U_ZERO_ERROR;
UDate min = d;
UDate max = min + SIX_MONTHS;
- bool_t startsInDST = tz->inDaylightTime(d, status);
+ UBool startsInDST = tz->inDaylightTime(d, status);
if (failure(status, "SimpleTimeZone::inDaylightTime")) return;
if (tz->inDaylightTime(max, status) == startsInDST) {
logln("Error: inDaylightTime(" + dateToString(max) + ") != " + ((!startsInDST)?"true":"false"));
@@ -338,14 +338,14 @@ TimeZoneBoundaryTest::findBoundariesStepwise(int32_t year, UDate interval, TimeZ
UDate d = date(year - 1900, Calendar::JANUARY, 1);
UDate time = d;
UDate limit = time + ONE_YEAR + ONE_DAY;
- bool_t lastState = z->inDaylightTime(d, status);
+ UBool lastState = z->inDaylightTime(d, status);
if (failure(status, "TimeZone::inDaylightTime")) return;
int32_t changes = 0;
logln(UnicodeString("-- Zone ") + z->getID(str) + " starts in " + year + " with DST = " + (lastState?"true":"false"));
logln(UnicodeString("useDaylightTime = ") + (z->useDaylightTime()?"true":"false"));
while (time < limit) {
d = time;
- bool_t state = z->inDaylightTime(d, status);
+ UBool state = z->inDaylightTime(d, status);
if (failure(status, "TimeZone::inDaylightTime")) return;
if (state != lastState) {
logln(UnicodeString(state ? "Entry ": "Exit ") + "at " + d);
diff --git a/icu4c/source/test/intltest/tzbdtest.h b/icu4c/source/test/intltest/tzbdtest.h
index 35493c4888b..3d5467e7e73 100644
--- a/icu4c/source/test/intltest/tzbdtest.h
+++ b/icu4c/source/test/intltest/tzbdtest.h
@@ -18,7 +18,7 @@ class SimpleTimeZone;
*/
class TimeZoneBoundaryTest: public CalendarTimeZoneTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public: // package
static UDate ONE_SECOND;
static UDate ONE_MINUTE;
@@ -42,8 +42,8 @@ public: // package
* internal routines used by major test routines to perform subtests
**/
virtual void findDaylightBoundaryUsingDate(UDate d, const char* startMode, UDate expectedBoundary);
- virtual void findDaylightBoundaryUsingTimeZone(UDate d, bool_t startsInDST, UDate expectedBoundary);
- virtual void findDaylightBoundaryUsingTimeZone(UDate d, bool_t startsInDST, UDate expectedBoundary, TimeZone* tz);
+ virtual void findDaylightBoundaryUsingTimeZone(UDate d, UBool startsInDST, UDate expectedBoundary);
+ virtual void findDaylightBoundaryUsingTimeZone(UDate d, UBool startsInDST, UDate expectedBoundary, TimeZone* tz);
private:
//static UnicodeString* showDate(long l);
@@ -55,7 +55,7 @@ public: // package
* Given a date, a TimeZone, and expected values for inDaylightTime,
* useDaylightTime, zone and DST offset, verify that this is the case.
*/
- virtual void verifyDST(UDate d, TimeZone* time_zone, bool_t expUseDaylightTime, bool_t expInDaylightTime, UDate expZoneOffset, UDate expDSTOffset);
+ virtual void verifyDST(UDate d, TimeZone* time_zone, UBool expUseDaylightTime, UBool expInDaylightTime, UDate expZoneOffset, UDate expDSTOffset);
public:
/**
diff --git a/icu4c/source/test/intltest/tzregts.cpp b/icu4c/source/test/intltest/tzregts.cpp
index b4fa5d5bbe1..bd82646ead3 100644
--- a/icu4c/source/test/intltest/tzregts.cpp
+++ b/icu4c/source/test/intltest/tzregts.cpp
@@ -20,7 +20,7 @@
#define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
void
-TimeZoneRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+TimeZoneRegressionTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
// if (exec) logln((UnicodeString)"TestSuite NumberFormatRegressionTest");
switch (index) {
@@ -46,7 +46,7 @@ TimeZoneRegressionTest::runIndexedTest( int32_t index, bool_t exec, char* &name,
}
}
-bool_t
+UBool
TimeZoneRegressionTest::failure(UErrorCode status, const char* msg)
{
if(U_FAILURE(status)) {
@@ -82,7 +82,7 @@ void TimeZoneRegressionTest:: Test4073209() {
UDate TimeZoneRegressionTest::findTransitionBinary(const SimpleTimeZone& tz, UDate min, UDate max) {
UErrorCode status = U_ZERO_ERROR;
- bool_t startsInDST = tz.inDaylightTime(min, status);
+ UBool startsInDST = tz.inDaylightTime(min, status);
if (failure(status, "SimpleTimeZone::inDaylightTime")) return 0;
if (tz.inDaylightTime(max, status) == startsInDST) {
logln((UnicodeString)"Error: inDaylightTime() != " + ((!startsInDST)?"TRUE":"FALSE"));
@@ -103,7 +103,7 @@ UDate TimeZoneRegressionTest::findTransitionBinary(const SimpleTimeZone& tz, UDa
UDate TimeZoneRegressionTest::findTransitionStepwise(const SimpleTimeZone& tz, UDate min, UDate max) {
UErrorCode status = U_ZERO_ERROR;
- bool_t startsInDST = tz.inDaylightTime(min, status);
+ UBool startsInDST = tz.inDaylightTime(min, status);
if (failure(status, "SimpleTimeZone::inDaylightTime")) return 0;
while (min < max) {
if (tz.inDaylightTime(min, status) != startsInDST) {
@@ -143,7 +143,7 @@ void TimeZoneRegressionTest:: Test4073215()
UDate jan31, mar1, mar31;
- bool_t indt = z->inDaylightTime(jan31=cal.getTime(status), status);
+ UBool indt = z->inDaylightTime(jan31=cal.getTime(status), status);
failure(status, "inDaylightTime or getTime call on Jan 31");
if (indt) {
errln("Fail: Jan 31 inDaylightTime=TRUE, exp FALSE");
@@ -238,7 +238,7 @@ void TimeZoneRegressionTest:: Test4096952() {
// {sfb} serialization not applicable
/*
UnicodeString ZONES [] = { UnicodeString("GMT"), UnicodeString("MET"), UnicodeString("IST") };
- bool_t pass = TRUE;
+ UBool pass = TRUE;
//try {
for (int32_t i=0; i < ZONES.length; ++i) {
TimeZone *zone = TimeZone::createTimeZone(ZONES[i]);
@@ -296,7 +296,7 @@ void TimeZoneRegressionTest:: Test4109314() {
CalendarRegressionTest::makeDate(98,Calendar::OCTOBER,24,22,0),
CalendarRegressionTest::makeDate(98,Calendar::OCTOBER,25,6,0)
};
- bool_t pass = TRUE;
+ UBool pass = TRUE;
for (int32_t i = 0; i < 4; i+=2) {
//testCal->setTimeZone((TimeZone) testData[i]);
testCal->setTimeZone(*PST);
@@ -316,7 +316,7 @@ void TimeZoneRegressionTest:: Test4109314() {
delete PST;
}
-bool_t
+UBool
TimeZoneRegressionTest::checkCalendar314(GregorianCalendar *testCal, TimeZone *testTZ)
{
UErrorCode status = U_ZERO_ERROR;
@@ -364,12 +364,12 @@ TimeZoneRegressionTest::checkCalendar314(GregorianCalendar *testCal, TimeZone *t
UDate testDate = testCal->getTime(status);
- bool_t inDaylightTime = testTZ->inDaylightTime(testDate, status);
+ UBool inDaylightTime = testTZ->inDaylightTime(testDate, status);
SimpleDateFormat *sdf = new SimpleDateFormat((UnicodeString)"MM/dd/yyyy HH:mm", status);
sdf->setCalendar(*testCal);
UnicodeString inDaylightTimeString;
- bool_t passed;
+ UBool passed;
if(inDaylightTime)
{
@@ -573,7 +573,7 @@ void TimeZoneRegressionTest:: Test4154542()
};
SimpleTimeZone *zone = new SimpleTimeZone(0, "Z");
for (int32_t i=0; i < 18*5; i+=5) {
- bool_t shouldBeGood = (DATA[i] == GOOD);
+ UBool shouldBeGood = (DATA[i] == GOOD);
int32_t month = DATA[i+1];
int32_t day = DATA[i+2];
int32_t dayOfWeek = DATA[i+3];
@@ -670,7 +670,7 @@ TimeZoneRegressionTest::Test4154525()
UErrorCode status = U_ZERO_ERROR;
for(int32_t i = 0; i < 10; i+=2) {
int32_t savings = DATA[i];
- bool_t valid = DATA[i+1] == GOOD;
+ UBool valid = DATA[i+1] == GOOD;
UnicodeString method;
for(int32_t j=0; j < 2; ++j) {
SimpleTimeZone *z;
@@ -756,7 +756,7 @@ TimeZoneRegressionTest::Test4154650()
UErrorCode status = U_ZERO_ERROR;
TimeZone *tz = TimeZone::createDefault();
for(int32_t i = 0; i < dataLen; i += 7) {
- bool_t good = DATA[i] == GOOD;
+ UBool good = DATA[i] == GOOD;
//IllegalArgumentException e = null;
//try {
int32_t offset = tz->getOffset((uint8_t)DATA[i+1], DATA[i+2], DATA[i+3],
@@ -804,7 +804,7 @@ TimeZoneRegressionTest::Test4162593()
{100, Calendar::FEBRUARY, 29, 22, 0},
};
- bool_t DATA_BOOL [] = {
+ UBool DATA_BOOL [] = {
TRUE,
FALSE,
TRUE,
@@ -825,7 +825,7 @@ TimeZoneRegressionTest::Test4162593()
// Must construct the Date object AFTER setting the default zone
int32_t *p = (int32_t*)DATA_INT[j];
UDate d = CalendarRegressionTest::makeDate(p[0], p[1], p[2], p[3], p[4]);
- bool_t transitionExpected = DATA_BOOL[j];
+ UBool transitionExpected = DATA_BOOL[j];
UnicodeString temp;
logln(tz->getID(temp) + ":");
diff --git a/icu4c/source/test/intltest/tzregts.h b/icu4c/source/test/intltest/tzregts.h
index 30b243b545a..a59bc2aeefc 100644
--- a/icu4c/source/test/intltest/tzregts.h
+++ b/icu4c/source/test/intltest/tzregts.h
@@ -22,7 +22,7 @@ class SimpleTimeZone;
class TimeZoneRegressionTest: public IntlTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public:
void Test4052967(void);
@@ -42,13 +42,13 @@ public:
void TestJ186(void);
void TestJDK12API(void);
- bool_t checkCalendar314(GregorianCalendar *testCal, TimeZone *testTZ);
+ UBool checkCalendar314(GregorianCalendar *testCal, TimeZone *testTZ);
protected:
UDate findTransitionBinary(const SimpleTimeZone& tz, UDate min, UDate max);
UDate findTransitionStepwise(const SimpleTimeZone& tz, UDate min, UDate max);
- bool_t failure(UErrorCode status, const char* msg);
+ UBool failure(UErrorCode status, const char* msg);
};
diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp
index fd728b0666f..01a358f3b1f 100644
--- a/icu4c/source/test/intltest/tztest.cpp
+++ b/icu4c/source/test/intltest/tztest.cpp
@@ -23,7 +23,7 @@
// class TimeZoneTest
// *****************************************************************************
-void TimeZoneTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void TimeZoneTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite TestTimeZone");
switch (index) {
@@ -254,7 +254,7 @@ void
TimeZoneTest::testUsingBinarySearch(SimpleTimeZone* tz, UDate min, UDate max, UDate expectedBoundary)
{
UErrorCode status = U_ZERO_ERROR;
- bool_t startsInDST = tz->inDaylightTime(min, status);
+ UBool startsInDST = tz->inDaylightTime(min, status);
if (failure(status, "SimpleTimeZone::inDaylightTime")) return;
if (tz->inDaylightTime(max, status) == startsInDST) {
logln("Error: inDaylightTime(" + dateToString(max) + ") != " + ((!startsInDST)?"TRUE":"FALSE"));
@@ -525,7 +525,7 @@ void TimeZoneTest::TestShortZoneIDs()
{
char id[4];
int32_t offset;
- bool_t daylight;
+ UBool daylight;
}
kReferenceList [] =
{
@@ -571,7 +571,7 @@ void TimeZoneTest::TestShortZoneIDs()
for(i=0;kReferenceList[i].id[0];i++) {
UnicodeString itsID(kReferenceList[i].id);
- bool_t ok = TRUE;
+ UBool ok = TRUE;
// Check existence.
TimeZone *tz = TimeZone::createTimeZone(itsID);
if (!tz) {
@@ -580,7 +580,7 @@ void TimeZoneTest::TestShortZoneIDs()
}
// Check daylight usage.
- bool_t usesDaylight = tz->useDaylightTime();
+ UBool usesDaylight = tz->useDaylightTime();
if (usesDaylight != kReferenceList[i].daylight) {
errln("FAIL: Time Zone " + itsID + " use daylight is " +
(usesDaylight?"TRUE":"FALSE") +
@@ -840,7 +840,7 @@ TimeZoneTest::TestDisplayName()
//*****************************************************************
struct
{
- bool_t useDst;
+ UBool useDst;
TimeZone::EDisplayType style;
char expect[100];
} kData[] = {
@@ -907,7 +907,7 @@ TimeZoneTest::TestDisplayName()
//if(U_FAILURE(status))
// errln("Couldn't get ResourceBundle for zh_CN");
- bool_t noZH = U_FAILURE(status);
+ UBool noZH = U_FAILURE(status);
if (noZH) {
logln("Warning: Not testing the zh_CN behavior because resource is absent");
diff --git a/icu4c/source/test/intltest/tztest.h b/icu4c/source/test/intltest/tztest.h
index f8f3cb82bfc..5423fa277ac 100644
--- a/icu4c/source/test/intltest/tztest.h
+++ b/icu4c/source/test/intltest/tztest.h
@@ -17,7 +17,7 @@ class SimpleTimeZone;
**/
class TimeZoneTest: public CalendarTimeZoneTest {
// IntlTest override
- void runIndexedTest( int32_t index, bool_t exec, char* &name, char* par );
+ void runIndexedTest( int32_t index, UBool exec, char* &name, char* par );
public: // package
static const int32_t millisPerHour;
diff --git a/icu4c/source/test/intltest/ucdtest.cpp b/icu4c/source/test/intltest/ucdtest.cpp
index 0116252defc..73aa6f419e1 100644
--- a/icu4c/source/test/intltest/ucdtest.cpp
+++ b/icu4c/source/test/intltest/ucdtest.cpp
@@ -19,7 +19,7 @@ UnicodeTest::~UnicodeTest()
{
}
-void UnicodeTest::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
+void UnicodeTest::runIndexedTest( int32_t index, UBool exec, char* &name, char* par )
{
if (exec) logln("TestSuite UnicodeTest: ");
switch (index) {
@@ -562,7 +562,7 @@ void UnicodeTest::TestCharLength()
};
int16_t i;
- bool_t multiple;
+ UBool multiple;
for(i=0; ifBogus;
diff --git a/icu4c/source/tools/chardir/ucmp8.h b/icu4c/source/tools/chardir/ucmp8.h
index 8088a872f55..15ca640b2b4 100644
--- a/icu4c/source/tools/chardir/ucmp8.h
+++ b/icu4c/source/tools/chardir/ucmp8.h
@@ -37,8 +37,8 @@ typedef struct{
int8_t* fArray;
uint16_t* fIndex;
int32_t fCount;
- bool_t fCompact;
- bool_t fBogus;
+ UBool fCompact;
+ UBool fBogus;
} CompactByteArray;
U_CAPI CompactByteArray* ucmp8_open(int8_t defaultValue);
@@ -46,7 +46,7 @@ U_CAPI CompactByteArray* ucmp8_openAdopt(uint16_t* indexArray,
int8_t* newValues,
int32_t count);
U_CAPI void ucmp8_close(CompactByteArray* array);
-U_CAPI bool_t isBogus(const CompactByteArray* array);
+U_CAPI UBool isBogus(const CompactByteArray* array);
U_CAPI int8_t ucmp8_get(CompactByteArray* array, uint16_t index);
diff --git a/icu4c/source/tools/chartype/ucmp8.c b/icu4c/source/tools/chartype/ucmp8.c
index bee91f6def0..209beeb6123 100644
--- a/icu4c/source/tools/chartype/ucmp8.c
+++ b/icu4c/source/tools/chartype/ucmp8.c
@@ -232,7 +232,7 @@ findOverlappingPosition(CompactByteArray* this,
return i;
}
-bool_t
+UBool
ucmp8_isBogus(const CompactByteArray* this)
{
return this->fBogus;
diff --git a/icu4c/source/tools/chartype/ucmp8.h b/icu4c/source/tools/chartype/ucmp8.h
index 28d2e1043a6..5e2a5748796 100644
--- a/icu4c/source/tools/chartype/ucmp8.h
+++ b/icu4c/source/tools/chartype/ucmp8.h
@@ -38,8 +38,8 @@ typedef struct{
int8_t* fArray;
uint16_t* fIndex;
int32_t fCount;
- bool_t fCompact;
- bool_t fBogus;
+ UBool fCompact;
+ UBool fBogus;
} CompactByteArray;
U_CAPI CompactByteArray* ucmp8_open(int8_t defaultValue);
@@ -47,7 +47,7 @@ U_CAPI CompactByteArray* ucmp8_openAdopt(uint16_t* indexArray,
int8_t* newValues,
int32_t count);
U_CAPI void ucmp8_close(CompactByteArray* array);
-U_CAPI bool_t isBogus(const CompactByteArray* array);
+U_CAPI UBool isBogus(const CompactByteArray* array);
U_CAPI int8_t ucmp8_get(CompactByteArray* array, uint16_t index);
diff --git a/icu4c/source/tools/gencmn/gencmn.c b/icu4c/source/tools/gencmn/gencmn.c
index 6074036f103..f90b4674d3d 100644
--- a/icu4c/source/tools/gencmn/gencmn.c
+++ b/icu4c/source/tools/gencmn/gencmn.c
@@ -64,7 +64,7 @@ static uint32_t fileCount=0;
/* prototypes --------------------------------------------------------------- */
static void
-addFile(const char *filename, bool_t sourceTOC);
+addFile(const char *filename, UBool sourceTOC);
static char *
allocString(uint32_t length);
@@ -96,7 +96,7 @@ main(int argc, const char *argv[]) {
char *s;
UErrorCode errorCode=U_ZERO_ERROR;
uint32_t i, fileOffset, basenameOffset, length;
- bool_t sourceTOC;
+ UBool sourceTOC;
/* preset then read command line options */
options[4].value=u_getDataDirectory();
@@ -344,7 +344,7 @@ main(int argc, const char *argv[]) {
}
static void
-addFile(const char *filename, bool_t sourceTOC) {
+addFile(const char *filename, UBool sourceTOC) {
char *s;
uint32_t length;
diff --git a/icu4c/source/tools/gennames/gennames.c b/icu4c/source/tools/gennames/gennames.c
index 509b762cf21..c08cdc25b6e 100644
--- a/icu4c/source/tools/gennames/gennames.c
+++ b/icu4c/source/tools/gennames/gennames.c
@@ -63,7 +63,7 @@ static UDataInfo dataInfo={
3, 0, 0, 0 /* dataVersion */
};
-static bool_t beVerbose=FALSE, beQuiet=FALSE, haveCopyright=TRUE;
+static UBool beVerbose=FALSE, beQuiet=FALSE, haveCopyright=TRUE;
static uint8_t stringStore[STRING_STORE_SIZE],
groupStore[GROUP_STORE_SIZE],
@@ -102,7 +102,7 @@ static void
init();
static void
-parseDB(const char *filename, bool_t store10Names);
+parseDB(const char *filename, UBool store10Names);
static void
parseName(char *name, int16_t length);
@@ -209,7 +209,7 @@ static UOption options[]={
extern int
main(int argc, const char *argv[]) {
UVersionInfo version;
- bool_t store10Names=FALSE;
+ UBool store10Names=FALSE;
/* preset then read command line options */
options[5].value=u_getDataDirectory();
@@ -298,7 +298,7 @@ lineFn(void *context,
/* get the second character name, the one from Unicode 1.0 */
/* do not store pseudo-names in <> brackets */
name2Start=fields[10][0];
- if(*(bool_t *)context && fields[10][0][0]!='<') {
+ if(*(UBool *)context && fields[10][0][0]!='<') {
name2Length=fields[10][1]-name2Start;
} else {
name2Length=0;
@@ -315,7 +315,7 @@ lineFn(void *context,
}
static void
-parseDB(const char *filename, bool_t store10Names) {
+parseDB(const char *filename, UBool store10Names) {
char *fields[11][2];
UErrorCode errorCode=U_ZERO_ERROR;
diff --git a/icu4c/source/tools/genprops/genprops.c b/icu4c/source/tools/genprops/genprops.c
index d73ee202ae6..1a1df21f9db 100644
--- a/icu4c/source/tools/genprops/genprops.c
+++ b/icu4c/source/tools/genprops/genprops.c
@@ -33,7 +33,7 @@
#include "uparse.h"
#include "genprops.h"
-bool_t beVerbose=FALSE, haveCopyright=TRUE;
+UBool beVerbose=FALSE, haveCopyright=TRUE;
/* prototypes --------------------------------------------------------------- */
diff --git a/icu4c/source/tools/genprops/genprops.h b/icu4c/source/tools/genprops/genprops.h
index 0c3da3368dd..1d981d78431 100644
--- a/icu4c/source/tools/genprops/genprops.h
+++ b/icu4c/source/tools/genprops/genprops.h
@@ -33,7 +33,7 @@ typedef struct {
} Props;
/* global flags */
-extern bool_t beVerbose, haveCopyright;
+extern UBool beVerbose, haveCopyright;
/* name tables */
extern const char *const
diff --git a/icu4c/source/tools/genprops/store.c b/icu4c/source/tools/genprops/store.c
index f43816b1d5c..fb7aa020a6d 100644
--- a/icu4c/source/tools/genprops/store.c
+++ b/icu4c/source/tools/genprops/store.c
@@ -394,7 +394,7 @@ addProps(Props *p) {
uint32_t x;
int32_t value;
uint16_t count;
- bool_t isNumber;
+ UBool isNumber;
/*
* Simple ideas for reducing the number of bits for one character's
diff --git a/icu4c/source/tools/genrb/genrb.c b/icu4c/source/tools/genrb/genrb.c
index 150c1818008..c5eb0b7d6c0 100644
--- a/icu4c/source/tools/genrb/genrb.c
+++ b/icu4c/source/tools/genrb/genrb.c
@@ -89,7 +89,7 @@ main(int argc,
const char *outputDir = NULL; /* NULL = no output directory, use current */
const char *inputDir = NULL;
const char *encoding = "";
- bool_t verbose;
+ UBool verbose;
argc = u_parseArgs(argc, argv, sizeof(options)/sizeof(options[0]), options);
diff --git a/icu4c/source/tools/genrb/parse.c b/icu4c/source/tools/genrb/parse.c
index c525f2d77d6..7980f8c0d0b 100644
--- a/icu4c/source/tools/genrb/parse.c
+++ b/icu4c/source/tools/genrb/parse.c
@@ -37,7 +37,7 @@ U_STRING_DECL(k_start_array, "array", 5);
U_STRING_DECL(k_start_intvector, "intvector", 9);
U_STRING_DECL(k_start_reserved, "reserved", 8);
-static bool_t didInit=FALSE;
+static UBool didInit=FALSE;
/* Node IDs for the state transition table. */
enum ENode {
@@ -150,7 +150,7 @@ static struct STransition gTransitionTable [] = {
* Hashtable glue
********************************************************************/
-static bool_t get(UHashtable *hash, const struct UString* tag) {
+static UBool get(UHashtable *hash, const struct UString* tag) {
return uhash_get(hash, tag) != NULL;
}
@@ -171,7 +171,7 @@ static int32_t hashUString(const void* ustr) {
return uhash_hashUChars(((struct UString*)ustr)->fChars);
}
-static bool_t compareUString(const void* ustr1, const void* ustr2) {
+static UBool compareUString(const void* ustr1, const void* ustr2) {
return uhash_compareUChars(((struct UString*)ustr1)->fChars,
((struct UString*)ustr2)->fChars);
}
@@ -199,7 +199,7 @@ parse(FileStream *f, const char *cp,
struct SResource *temp = NULL;
struct SResource *temp1 = NULL;
struct SResource *temp2 = NULL;
- bool_t colEl = FALSE;
+ UBool colEl = FALSE;
/* Hashtable for keeping track of seen tag names */
struct UHashtable *data;
diff --git a/icu4c/source/tools/genrb/read.c b/icu4c/source/tools/genrb/read.c
index 2b0561f8b72..4753d5d0643 100644
--- a/icu4c/source/tools/genrb/read.c
+++ b/icu4c/source/tools/genrb/read.c
@@ -39,18 +39,18 @@ U_STRING_DECL(k_start_array, "array", 5);
U_STRING_DECL(k_start_intvector, "intvector", 9);
U_STRING_DECL(k_start_reserved, "reserved", 8);
-static bool_t didInit=FALSE;
+static UBool didInit=FALSE;
/* Protos */
static enum ETokenType getStringToken(UFILE *f, UChar initialChar,
struct UString *token,
UErrorCode *status);
static UChar unescape(UFILE *f, UErrorCode *status);
-static UChar getNextChar(UFILE *f, bool_t skipwhite, UErrorCode *status);
+static UChar getNextChar(UFILE *f, UBool skipwhite, UErrorCode *status);
static void seekUntilNewline(UFILE *f, UErrorCode *status);
static void seekUntilEndOfComment(UFILE *f, UErrorCode *status);
-static bool_t isWhitespace(UChar c);
-static bool_t isNewline(UChar c);
+static UBool isWhitespace(UChar c);
+static UBool isNewline(UChar c);
/* Read and return the next token from the stream. If the token is of
@@ -134,7 +134,7 @@ static enum ETokenType getStringToken(UFILE *f,
struct UString *token,
UErrorCode *status)
{
- bool_t lastStringWasQuoted;
+ UBool lastStringWasQuoted;
UChar c;
/* We are guaranteed on entry that initialChar is not a whitespace
@@ -230,7 +230,7 @@ static enum ETokenType getStringToken(UFILE *f,
/* Retrieve the next character, ignoring comments. If skipwhite is
true, whitespace is skipped as well. */
static UChar getNextChar(UFILE *f,
- bool_t skipwhite,
+ UBool skipwhite,
UErrorCode *status)
{
UChar c;
@@ -400,7 +400,7 @@ static UChar unescape(UFILE *f,
}
}
-static bool_t isWhitespace(UChar c)
+static UBool isWhitespace(UChar c)
{
switch (c) {
/* ' ', '\t', '\n', '\r', 0x2029, 0xFEFF */
@@ -412,7 +412,7 @@ static bool_t isWhitespace(UChar c)
}
}
-static bool_t isNewline(UChar c)
+static UBool isNewline(UChar c)
{
switch (c) {
/* '\n', '\r', 0x2029 */
diff --git a/icu4c/source/tools/gentz/gentz.cpp b/icu4c/source/tools/gentz/gentz.cpp
index 283c4a1d770..95fd12ce5e9 100644
--- a/icu4c/source/tools/gentz/gentz.cpp
+++ b/icu4c/source/tools/gentz/gentz.cpp
@@ -99,7 +99,7 @@ class gentz {
int32_t offsetIndexSize; // Total bytes in offset index table
int32_t nameTableSize; // Total bytes in name table
- bool_t useCopyright;
+ UBool useCopyright;
public:
int main(int argc, const char *argv[]);
@@ -361,7 +361,7 @@ OffsetIndex* gentz::parseOffsetIndexTable(FileStream* in) {
index->defaultZone = (uint16_t)parseInteger(p, SEP, 0, header.count-1);
index->count = (uint16_t)parseInteger(p, SEP, 1, maxPerOffset);
uint16_t* zoneNumberArray = &(index->zoneNumber);
- bool_t sawOffset = FALSE; // Sanity check - make sure offset is in zone list
+ UBool sawOffset = FALSE; // Sanity check - make sure offset is in zone list
for (uint16_t j=0; jcount; ++j) {
zoneNumberArray[j] = (uint16_t)
parseInteger(p, (j==(index->count-1))?NUL:SEP,
@@ -548,7 +548,7 @@ int32_t gentz::_parseInteger(char*& p) {
int32_t n = 0;
int32_t digitCount = 0;
int32_t digit;
- bool_t negative = FALSE;
+ UBool negative = FALSE;
if (*p == MINUS) {
++p;
negative = TRUE;
diff --git a/icu4c/source/tools/makeconv/makeconv.c b/icu4c/source/tools/makeconv/makeconv.c
index f03b793d98f..ab6752eb52d 100644
--- a/icu4c/source/tools/makeconv/makeconv.c
+++ b/icu4c/source/tools/makeconv/makeconv.c
@@ -41,7 +41,7 @@ extern const UConverterStaticData * ucnv_converterStaticData[UCNV_NUMBER_OF_SUPP
/*
* Global - verbosity
*/
-bool_t VERBOSE = FALSE;
+UBool VERBOSE = FALSE;
/*Reads the header of the table file and fills in basic knowledge about the converter
@@ -84,7 +84,7 @@ static void WriteConverterSharedData(UNewDataMemory *pData, const UConverterShar
/*
* Deletes the static data, table. Ignores any other options in the shareddata.
*/
-bool_t makeconv_deleteSharedConverterData(UConverterSharedData* deadSharedData);
+UBool makeconv_deleteSharedConverterData(UConverterSharedData* deadSharedData);
/*
* Utility functions
@@ -136,7 +136,7 @@ char *
/* Returns true in c is a in set 'setOfChars', false otherwise
*/
-bool_t
+UBool
isInSet (char c, const char *setOfChars)
{
uint8_t i = 0;
@@ -178,7 +178,7 @@ char *
return line + i;
}
-bool_t haveCopyright=TRUE;
+UBool haveCopyright=TRUE;
static const UDataInfo dataInfo={
sizeof(UDataInfo),
@@ -422,9 +422,9 @@ void readHeaderFromFile(UConverterStaticData* myConverter,
char key[15];
char value[30];
char* line = storeLine;
- bool_t endOfHeader = FALSE;
- bool_t hasConvClass = FALSE;
- bool_t hasSubChar = FALSE;
+ UBool endOfHeader = FALSE;
+ UBool hasConvClass = FALSE;
+ UBool hasSubChar = FALSE;
char codepointByte[3];
if (U_FAILURE(*err)) return;
@@ -578,7 +578,7 @@ UConverterTable *loadSBCSTableFromFile(FileStream* convFile, UConverterStaticDat
UConverterTable* myUConverterTable = NULL;
UChar unicodeValue = 0xFFFF;
int32_t sbcsCodepageValue = 0, fallback = 0;
- bool_t seenFallback = FALSE;
+ UBool seenFallback = FALSE;
char codepointBytes[5];
unsigned char replacementChar = '\0';
int32_t i = 0;
@@ -695,7 +695,7 @@ UConverterTable *loadMBCSTableFromFile(FileStream* convFile, UConverterStaticDat
int32_t mbcsCodepageValue = '\0';
char codepointBytes[6];
int32_t replacementChar = 0x0000, fallback = 0;
- bool_t seenFallback = FALSE;
+ UBool seenFallback = FALSE;
uint16_t i = 0;
CompactShortArray *myFromUnicode = NULL, *myFromUnicodeFallback = NULL;
CompactShortArray *myToUnicode = NULL, *myToUnicodeFallback = NULL;
@@ -712,7 +712,7 @@ UConverterTable *loadMBCSTableFromFile(FileStream* convFile, UConverterStaticDat
uprv_memset(myUConverterTable, 0, sizeof(UConverterMBCSTable));
- myUConverterTable->mbcs.starters = (bool_t*)(uprv_malloc(sizeof(bool_t)*256));
+ myUConverterTable->mbcs.starters = (UBool*)(uprv_malloc(sizeof(UBool)*256));
if (myUConverterTable->mbcs.starters == NULL)
{
*err = U_MEMORY_ALLOCATION_ERROR;
@@ -826,7 +826,7 @@ UConverterTable *loadEBCDIC_STATEFULTableFromFile(FileStream* convFile, UConvert
char codepointBytes[6];
int32_t replacementChar = 0x0000, fallback = 0;
uint8_t i = 0;
- bool_t seenFallback = FALSE;
+ UBool seenFallback = FALSE;
CompactShortArray* myFromUnicode = NULL;
CompactShortArray* myToUnicode = NULL;
CompactShortArray* myFromUnicodeFallback = NULL;
@@ -939,7 +939,7 @@ UConverterTable * loadDBCSTableFromFile(FileStream* convFile, UConverterStaticDa
char codepointBytes[6];
int32_t replacementChar = 0x0000, fallback = 0;
uint8_t i = 0;
- bool_t seenFallback = FALSE;
+ UBool seenFallback = FALSE;
CompactShortArray* myFromUnicode = NULL;
CompactShortArray* myToUnicode = NULL;
CompactShortArray* myFromUnicodeFallback = NULL;
@@ -1041,7 +1041,7 @@ UConverterTable * loadDBCSTableFromFile(FileStream* convFile, UConverterStaticDa
}
/*deletes the "shared" type object*/
-bool_t makeconv_deleteSharedConverterData(UConverterSharedData* deadSharedData)
+UBool makeconv_deleteSharedConverterData(UConverterSharedData* deadSharedData)
{
if (deadSharedData->staticData->conversionType == UCNV_SBCS)
{
@@ -1242,8 +1242,8 @@ static void WriteConverterSharedData(UNewDataMemory *pData, const UConverterShar
case UCNV_MBCS:
{
- udata_writeBlock(pData, data->table->mbcs.starters, 256*sizeof(bool_t));
- size += 256*sizeof(bool_t);
+ udata_writeBlock(pData, data->table->mbcs.starters, 256*sizeof(UBool));
+ size += 256*sizeof(UBool);
size += udata_write_ucmp16(pData,&data->table->mbcs.toUnicode);
if(size%4)
{
diff --git a/icu4c/source/tools/mkhelper/mkhelper.c b/icu4c/source/tools/mkhelper/mkhelper.c
index d991fed1381..1ed9bd98227 100644
--- a/icu4c/source/tools/mkhelper/mkhelper.c
+++ b/icu4c/source/tools/mkhelper/mkhelper.c
@@ -87,7 +87,7 @@ int VARS_DEF_FILE[MAX_VARS]; /* The index of the last file to define
def not seen in any file. */
char** VARS_DEF[MAX_VARS]; /* Actual definitions */
int VARS_DEF_I[MAX_VARS]; /* Index var used by readVarDefs */
-bool_t VERBOSE = FALSE;
+UBool VERBOSE = FALSE;
/* CONSTANTS */
const char COMMENT = '#';
@@ -116,11 +116,11 @@ void usage(const char* argv0);
void countVarDefs(char* token, int32_t len, int fileNo, int varNo);
void readVarDefs(char* token, int32_t len, int fileNo, int varNo);
enum FileStat processFile(FileStream*, TokenHandler, int fileNo);
-void processLine(int fileNo, int varNo, char* line, bool_t isFirstLine, TokenHandler proc);
+void processLine(int fileNo, int varNo, char* line, UBool isFirstLine, TokenHandler proc);
char* substituteEnvironmentVars(char*);
char* skipWhiteSpace(char* p);
int32_t readLine(FileStream*);
-void assert(int); /* use of bool_t as arg causes warnings */
+void assert(int); /* use of UBool as arg causes warnings */
void memassert(void* a);
/**
@@ -151,7 +151,7 @@ void usage(const char* argv0) {
int main(int argc, char *argv[]) {
int i, j;
- bool_t err=FALSE;
+ UBool err=FALSE;
parseCommandLine(argc, argv);
for (i=0; i= 0) {
if (len) {
- bool_t varFound = FALSE;
+ UBool varFound = FALSE;
/* Skip white space */
p = skipWhiteSpace(BUFFER);
/* Is the next word a var? */
@@ -415,7 +415,7 @@ enum FileStat processFile(FileStream* in, TokenHandler proc, int fileNo) {
if (0 == uprv_strncmp(VARS[j], p, uprv_strlen(VARS[j]))) {
/* Yes, found a var, maybe...parse more to see */
char* savep = p;
- bool_t isFirstLine = TRUE;
+ UBool isFirstLine = TRUE;
p += uprv_strlen(VARS[j]); /* Go past var name */
diff --git a/icu4c/source/tools/ulxfrm/ucmp16.c b/icu4c/source/tools/ulxfrm/ucmp16.c
index f67268280de..b3059095581 100644
--- a/icu4c/source/tools/ulxfrm/ucmp16.c
+++ b/icu4c/source/tools/ulxfrm/ucmp16.c
@@ -57,7 +57,7 @@ static CompactShortArray* setToBogus(CompactShortArray* array);
static void touchBlock(CompactShortArray* this,
int32_t i,
int16_t value);
-static bool_t blockTouched(const CompactShortArray* this,
+static UBool blockTouched(const CompactShortArray* this,
int32_t i);
@@ -283,7 +283,7 @@ void ucmp16_compact(CompactShortArray* this)
for (i = 0, iBlockStart = 0; i < (1 << (16 - this->kBlockShift)); i += 1, iBlockStart += (1 << this->kBlockShift))
{
- bool_t touched = blockTouched(this, i);
+ UBool touched = blockTouched(this, i);
this->fIndex[i] = 0xFFFF;
@@ -372,7 +372,7 @@ void touchBlock(CompactShortArray* this,
this->fHashes[i] = (this->fHashes[i] + (value << 1)) | 1;
}
-bool_t blockTouched(const CompactShortArray* this, int32_t i)
+UBool blockTouched(const CompactShortArray* this, int32_t i)
{
return (this->fHashes[i] != 0);
}
diff --git a/icu4c/source/tools/ulxfrm/ucmp16.h b/icu4c/source/tools/ulxfrm/ucmp16.h
index 4862af34397..20bcbba9af3 100644
--- a/icu4c/source/tools/ulxfrm/ucmp16.h
+++ b/icu4c/source/tools/ulxfrm/ucmp16.h
@@ -72,7 +72,7 @@
* @see CompactIntArray
* @see CompactCharArray
* @see CompactStringArray
- * @version $Revision: 1.5 $ 8/25/98
+ * @version $Revision: 1.6 $ 8/25/98
* @author Helena Shih
*/
@@ -83,8 +83,8 @@ typedef struct
int32_t* fHashes;
int32_t fCount;
int16_t fDefaultValue;
- bool_t fCompact;
- bool_t fBogus;
+ UBool fCompact;
+ UBool fBogus;
int32_t kBlockShift;
int32_t kBlockMask;
} CompactShortArray;
@@ -137,7 +137,7 @@ U_CAPI void ucmp16_close(CompactShortArray* array);
* Returns TRUE if the creation of the compact array fails.
*/
-U_CAPI bool_t ucmp16_isBogus(const CompactShortArray* array);
+U_CAPI UBool ucmp16_isBogus(const CompactShortArray* array);
/**
*