organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-20973 Change all equality operator return types from UBool to bool.

Browse source
This commit is contained in:
Fredrik Roubert 2020-09-16 16:50:15 +02:00 • committed by Fredrik Roubert
parent ee7468a565
commit 633438f8da
163 changed files with 331 additions and 331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/bytestriebuilder.cpp
View file

@ -343,7 +343,7 @@ BytesTrieBuilder::BTLinearMatchNode::BTLinearMatchNode(const char *bytes, int32_
static_cast<uint32_t>(hash)*37u + static_cast<uint32_t>(ustr_hashCharsN(bytes, len)));
}
UBool
bool
BytesTrieBuilder::BTLinearMatchNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;

2
icu4c/source/common/dtintrv.cpp
View file

@ -53,7 +53,7 @@ DateInterval::clone() const {
}
UBool
bool
DateInterval::operator==(const DateInterval& other) const {
return ( fromDate == other.fromDate && toDate == other.toDate );
}

2
icu4c/source/common/filteredbrk.cpp
View file

@ -193,7 +193,7 @@ public:
}
virtual SimpleFilteredSentenceBreakIterator* clone() const { return new SimpleFilteredSentenceBreakIterator(*this); }
virtual UClassID getDynamicClassID(void) const { return NULL; }
virtual UBool operator==(const BreakIterator& o) const { if(this==&o) return true; return false; }
virtual bool operator==(const BreakIterator& o) const { if(this==&o) return true; return false; }
/* -- text modifying -- */
virtual void setText(UText *text, UErrorCode &status) { fDelegate->setText(text,status); }

2
icu4c/source/common/locid.cpp
View file

@ -483,7 +483,7 @@ Locale::clone() const {
return new Locale(*this);
}
UBool
bool
Locale::operator==( const Locale& other) const
{
return (uprv_strcmp(other.fullName, fullName) == 0);

2
icu4c/source/common/lsr.cpp
View file

@ -72,7 +72,7 @@ UBool LSR::isEquivalentTo(const LSR &other) const {
(regionIndex > 0 || uprv_strcmp(region, other.region) == 0);
}
UBool LSR::operator==(const LSR &other) const {
bool LSR::operator==(const LSR &other) const {
return
uprv_strcmp(language, other.language) == 0 &&
uprv_strcmp(script, other.script) == 0 &&

4
icu4c/source/common/lsr.h
View file

@ -65,9 +65,9 @@ struct LSR final : public UMemory {
static int32_t indexForRegion(const char *region);
UBool isEquivalentTo(const LSR &other) const;
UBool operator==(const LSR &other) const;
bool operator==(const LSR &other) const;
inline UBool operator!=(const LSR &other) const {
inline bool operator!=(const LSR &other) const {
return !operator==(other);
}

4
icu4c/source/common/messagepattern.cpp
View file

@ -309,7 +309,7 @@ MessagePattern::clear() {
numericValuesLength=0;
}
UBool
bool
MessagePattern::operator==(const MessagePattern &other) const {
if(this==&other) {
return TRUE;
@ -387,7 +387,7 @@ MessagePattern::getPluralOffset(int32_t pluralStart) const {
// MessagePattern::Part ---------------------------------------------------- ***
UBool
bool
MessagePattern::Part::operator==(const Part &other) const {
if(this==&other) {
return TRUE;

2
icu4c/source/common/normlzr.cpp
View file

@ -108,7 +108,7 @@ int32_t Normalizer::hashCode() const
return text->hashCode() + fUMode + fOptions + buffer.hashCode() + bufferPos + currentIndex + nextIndex;
}
UBool Normalizer::operator==(const Normalizer& that) const
bool Normalizer::operator==(const Normalizer& that) const
{
return
this==&that ||

4
icu4c/source/common/rbbi.cpp
View file

@ -366,10 +366,10 @@ RuleBasedBreakIterator::clone() const {
}
/**
* Equality operator. Returns TRUE if both BreakIterators are of the
* Equality operator. Returns true if both BreakIterators are of the
* same class, have the same behavior, and iterate over the same text.
*/
UBool
bool
RuleBasedBreakIterator::operator==(const BreakIterator& that) const {
if (typeid(*this) != typeid(that)) {
return FALSE;

2
icu4c/source/common/rbbidata.cpp
View file

@ -170,7 +170,7 @@ RBBIDataWrapper::~RBBIDataWrapper() {
// should still be ==.
//
//-----------------------------------------------------------------------------
UBool RBBIDataWrapper::operator ==(const RBBIDataWrapper &other) const {
bool RBBIDataWrapper::operator ==(const RBBIDataWrapper &other) const {
if (fHeader == other.fHeader) {
return TRUE;
}

2
icu4c/source/common/rbbidata.h
View file

@ -171,7 +171,7 @@ public:
void init(const RBBIDataHeader *data, UErrorCode &status);
RBBIDataWrapper *addReference();
void removeReference();
UBool operator ==(const RBBIDataWrapper &other) const;
bool operator ==(const RBBIDataWrapper &other) const;
int32_t hashCode();
const UnicodeString &getRuleSourceString() const;
void printData();

2
icu4c/source/common/rbbinode.h
View file

@ -108,7 +108,7 @@ class RBBINode : public UMemory {
private:
RBBINode &operator = (const RBBINode &other); // No defs.
UBool operator == (const RBBINode &other); // Private, so these functions won't accidentally be used.
bool operator == (const RBBINode &other); // Private, so these functions won't accidentally be used.
#ifdef RBBI_DEBUG
public:

2
icu4c/source/common/schriter.cpp
View file

@ -79,7 +79,7 @@ StringCharacterIterator::operator=(const StringCharacterIterator& that) {
return *this;
}
UBool
bool
StringCharacterIterator::operator==(const ForwardCharacterIterator& that) const {
if (this == &that) {
return TRUE;

16
icu4c/source/common/stringtriebuilder.cpp
View file

@ -383,7 +383,7 @@ StringTrieBuilder::equalNodes(const void *left, const void *right) {
return *(const Node *)left==*(const Node *)right;
}
UBool
bool
StringTrieBuilder::Node::operator==(const Node &other) const {
return this==&other || (typeid(*this)==typeid(other) && hash==other.hash);
}
@ -396,7 +396,7 @@ StringTrieBuilder::Node::markRightEdgesFirst(int32_t edgeNumber) {
return edgeNumber;
}
UBool
bool
StringTrieBuilder::FinalValueNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;
@ -413,7 +413,7 @@ StringTrieBuilder::FinalValueNode::write(StringTrieBuilder &builder) {
offset=builder.writeValueAndFinal(value, TRUE);
}
UBool
bool
StringTrieBuilder::ValueNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;
@ -425,7 +425,7 @@ StringTrieBuilder::ValueNode::operator==(const Node &other) const {
return hasValue==o.hasValue && (!hasValue || value==o.value);
}
UBool
bool
StringTrieBuilder::IntermediateValueNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;
@ -451,7 +451,7 @@ StringTrieBuilder::IntermediateValueNode::write(StringTrieBuilder &builder) {
offset=builder.writeValueAndFinal(value, FALSE);
}
UBool
bool
StringTrieBuilder::LinearMatchNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;
@ -471,7 +471,7 @@ StringTrieBuilder::LinearMatchNode::markRightEdgesFirst(int32_t edgeNumber) {
return edgeNumber;
}
UBool
bool
StringTrieBuilder::ListBranchNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;
@ -550,7 +550,7 @@ StringTrieBuilder::ListBranchNode::write(StringTrieBuilder &builder) {
}
}
UBool
bool
StringTrieBuilder::SplitBranchNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;
@ -584,7 +584,7 @@ StringTrieBuilder::SplitBranchNode::write(StringTrieBuilder &builder) {
offset=builder.write(unit);
}
UBool
bool
StringTrieBuilder::BranchHeadNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;

2
icu4c/source/common/ucharstriebuilder.cpp
View file

@ -290,7 +290,7 @@ UCharsTrieBuilder::UCTLinearMatchNode::UCTLinearMatchNode(const UChar *units, in
hash=hash*37u+ustr_hashUCharsN(units, len);
}
UBool
bool
UCharsTrieBuilder::UCTLinearMatchNode::operator==(const Node &other) const {
if(this==&other) {
return TRUE;

2
icu4c/source/common/uchriter.cpp
View file

@ -66,7 +66,7 @@ UCharCharacterIterator::operator=(const UCharCharacterIterator& that) {
UCharCharacterIterator::~UCharCharacterIterator() {
}
UBool
bool
UCharCharacterIterator::operator==(const ForwardCharacterIterator& that) const {
if (this == &that) {
return TRUE;

4
icu4c/source/common/unicode/brkiter.h
View file

@ -124,7 +124,7 @@ public:
* object, and styles are not considered.
* @stable ICU 2.0
*/
virtual UBool operator==(const BreakIterator&) const = 0;
virtual bool operator==(const BreakIterator&) const = 0;
/**
* Returns the complement of the result of operator==
@ -132,7 +132,7 @@ public:
* @return the complement of the result of operator==
* @stable ICU 2.0
*/
UBool operator!=(const BreakIterator& rhs) const { return !operator==(rhs); }
bool operator!=(const BreakIterator& rhs) const { return !operator==(rhs); }
/**
* Return a polymorphic copy of this object. This is an abstract

2
icu4c/source/common/unicode/bytestriebuilder.h
View file

@ -156,7 +156,7 @@ private:
class BTLinearMatchNode : public LinearMatchNode {
public:
BTLinearMatchNode(const char *units, int32_t len, Node *nextNode);
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
virtual void write(StringTrieBuilder &builder);
private:
const char *s;

6
icu4c/source/common/unicode/chariter.h
View file

@ -114,7 +114,7 @@ public:
* character in the same character-storage object
* @stable ICU 2.0
*/
virtual UBool operator==(const ForwardCharacterIterator& that) const = 0;
virtual bool operator==(const ForwardCharacterIterator& that) const = 0;
/**
* Returns true when the iterators refer to different
@ -126,7 +126,7 @@ public:
* same text-storage object
* @stable ICU 2.0
*/
inline UBool operator!=(const ForwardCharacterIterator& that) const;
inline bool operator!=(const ForwardCharacterIterator& that) const;
/**
* Generates a hash code for this iterator.
@ -692,7 +692,7 @@ protected:
int32_t end;
};
inline UBool
inline bool
ForwardCharacterIterator::operator!=(const ForwardCharacterIterator& that) const {
return !operator==(that);
}

6
icu4c/source/common/unicode/dtintrv.h
View file

@ -109,14 +109,14 @@ public:
* @return true if the two DateIntervals are the same
* @stable ICU 4.0
*/
virtual UBool operator==(const DateInterval& other) const;
virtual bool operator==(const DateInterval& other) const;
/**
* Non-equality operator
* @return true if the two DateIntervals are not the same
* @stable ICU 4.0
*/
inline UBool operator!=(const DateInterval& other) const;
inline bool operator!=(const DateInterval& other) const;
/**
@ -151,7 +151,7 @@ DateInterval::getToDate() const {
}
inline UBool
inline bool
DateInterval::operator!=(const DateInterval& other) const {
return ( !operator==(other) );
}

10
icu4c/source/common/unicode/locid.h
View file

@ -326,20 +326,20 @@ public:
* Checks if two locale keys are the same.
*
* @param other The locale key object to be compared with this.
* @return True if the two locale keys are the same, false otherwise.
* @return true if the two locale keys are the same, false otherwise.
* @stable ICU 2.0
*/
UBool operator==(const Locale& other) const;
bool operator==(const Locale& other) const;
/**
* Checks if two locale keys are not the same.
*
* @param other The locale key object to be compared with this.
* @return True if the two locale keys are not the same, false
* @return true if the two locale keys are not the same, false
* otherwise.
* @stable ICU 2.0
*/
inline UBool operator!=(const Locale& other) const;
inline bool operator!=(const Locale& other) const;
/**
* Clone this object.
@ -1163,7 +1163,7 @@ private:
friend void U_CALLCONV locale_available_init();
};
inline UBool
inline bool
Locale::operator!=(const Locale& other) const
{
return !operator==(other);

8
icu4c/source/common/unicode/messagepattern.h
View file

@ -526,14 +526,14 @@ public:
* @return true if this object is equivalent to the other one.
* @stable ICU 4.8
*/
UBool operator==(const MessagePattern &other) const;
bool operator==(const MessagePattern &other) const;
/**
* @param other another object to compare with.
* @return false if this object is equivalent to the other one.
* @stable ICU 4.8
*/
inline UBool operator!=(const MessagePattern &other) const {
inline bool operator!=(const MessagePattern &other) const {
return !operator==(other);
}
@ -797,14 +797,14 @@ public:
* @return true if this object is equivalent to the other one.
* @stable ICU 4.8
*/
UBool operator==(const Part &other) const;
bool operator==(const Part &other) const;
/**
* @param other another object to compare with.
* @return false if this object is equivalent to the other one.
* @stable ICU 4.8
*/
inline UBool operator!=(const Part &other) const {
inline bool operator!=(const Part &other) const {
return !operator==(other);
}

6
icu4c/source/common/unicode/normlzr.h
View file

@ -584,7 +584,7 @@ public:
* @return comparison result
* @deprecated ICU 56 Use Normalizer2 instead.
*/
UBool operator==(const Normalizer& that) const;
bool operator==(const Normalizer& that) const;
/**
* Returns false when both iterators refer to the same character in the same
@ -594,7 +594,7 @@ public:
* @return comparison result
* @deprecated ICU 56 Use Normalizer2 instead.
*/
inline UBool operator!=(const Normalizer& that) const;
inline bool operator!=(const Normalizer& that) const;
/**
* Returns a pointer to a new Normalizer that is a clone of this one.
@ -777,7 +777,7 @@ private:
//-------------------------------------------------------------------------
#ifndef U_HIDE_DEPRECATED_API
inline UBool
inline bool
Normalizer::operator!= (const Normalizer& other) const
{ return ! operator==(other); }

8
icu4c/source/common/unicode/parsepos.h
View file

@ -100,14 +100,14 @@ public:
* @return true if the two parse positions are equal, false otherwise.
* @stable ICU 2.0
*/
inline UBool operator==(const ParsePosition& that) const;
inline bool operator==(const ParsePosition& that) const;
/**
* Equality operator.
* @return true if the two parse positions are not equal, false otherwise.
* @stable ICU 2.0
*/
inline UBool operator!=(const ParsePosition& that) const;
inline bool operator!=(const ParsePosition& that) const;
/**
* Clone this object.
@ -192,7 +192,7 @@ ParsePosition::operator=(const ParsePosition& copy)
return *this;
}
inline UBool
inline bool
ParsePosition::operator==(const ParsePosition& copy) const
{
if(index != copy.index || errorIndex != copy.errorIndex)
@ -201,7 +201,7 @@ ParsePosition::operator==(const ParsePosition& copy) const
return true;
}
inline UBool
inline bool
ParsePosition::operator!=(const ParsePosition& copy) const
{
return !operator==(copy);

6
icu4c/source/common/unicode/rbbi.h
View file

@ -260,7 +260,7 @@ public:
* same class, have the same behavior, and iterate over the same text.
* @stable ICU 2.0
*/
virtual UBool operator==(const BreakIterator& that) const;
virtual bool operator==(const BreakIterator& that) const;
/**
* Not-equal operator. If operator== returns true, this returns false,
@ -269,7 +269,7 @@ public:
* @return true if both BreakIterators are not same.
* @stable ICU 2.0
*/
inline UBool operator!=(const BreakIterator& that) const;
inline bool operator!=(const BreakIterator& that) const;
/**
* Returns a newly-constructed RuleBasedBreakIterator with the same
@ -719,7 +719,7 @@ private:
//
//------------------------------------------------------------------------------
inline UBool RuleBasedBreakIterator::operator!=(const BreakIterator& that) const {
inline bool RuleBasedBreakIterator::operator!=(const BreakIterator& that) const {
return !operator==(that);
}

2
icu4c/source/common/unicode/schriter.h
View file

@ -124,7 +124,7 @@ public:
* same string and are pointing at the same character.
* @stable ICU 2.0
*/
virtual UBool operator==(const ForwardCharacterIterator& that) const;
virtual bool operator==(const ForwardCharacterIterator& that) const;
/**
* Returns a new StringCharacterIterator referring to the same

4
icu4c/source/common/unicode/strenum.h
View file

@ -199,7 +199,7 @@ public:
* @return true if the enumerations are equal. false if not.
* @stable ICU 3.6
*/
virtual UBool operator==(const StringEnumeration& that)const;
virtual bool operator==(const StringEnumeration& that)const;
/**
* Compares this enumeration to other to check if both are not equal
*
@ -207,7 +207,7 @@ public:
* @return true if the enumerations are equal. false if not.
* @stable ICU 3.6
*/
virtual UBool operator!=(const StringEnumeration& that)const;
virtual bool operator!=(const StringEnumeration& that)const;
protected:
/**

2
icu4c/source/common/unicode/stringpiece.h
View file

@ -332,7 +332,7 @@ operator==(const StringPiece& x, const StringPiece& y);
* @return true if the string data is not equal
* @stable ICU 4.8
*/
inline UBool operator!=(const StringPiece& x, const StringPiece& y) {
inline bool operator!=(const StringPiece& x, const StringPiece& y) {
return !(x == y);
}

18
icu4c/source/common/unicode/stringtriebuilder.h
View file

@ -204,8 +204,8 @@ protected:
// Handles node==NULL.
static inline int32_t hashCode(const Node *node) { return node==NULL ? 0 : node->hashCode(); }
// Base class operator==() compares the actual class types.
virtual UBool operator==(const Node &other) const;
inline UBool operator!=(const Node &other) const { return !operator==(other); }
virtual bool operator==(const Node &other) const;
inline bool operator!=(const Node &other) const { return !operator==(other); }
/**
* Traverses the Node graph and numbers branch edges, with rightmost edges first.
* This is to avoid writing a duplicate node twice.
@ -265,7 +265,7 @@ protected:
class FinalValueNode : public Node {
public:
FinalValueNode(int32_t v) : Node(0x111111u*37u+v), value(v) {}
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
virtual void write(StringTrieBuilder &builder);
protected:
int32_t value;
@ -280,7 +280,7 @@ protected:
class ValueNode : public Node {
public:
ValueNode(int32_t initialHash) : Node(initialHash), hasValue(false), value(0) {}
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
void setValue(int32_t v) {
hasValue=true;
value=v;
@ -299,7 +299,7 @@ protected:
public:
IntermediateValueNode(int32_t v, Node *nextNode)
: ValueNode(0x222222u*37u+hashCode(nextNode)), next(nextNode) { setValue(v); }
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
virtual void write(StringTrieBuilder &builder);
protected:
@ -317,7 +317,7 @@ protected:
LinearMatchNode(int32_t len, Node *nextNode)
: ValueNode((0x333333u*37u+len)*37u+hashCode(nextNode)),
length(len), next(nextNode) {}
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
protected:
int32_t length;
@ -341,7 +341,7 @@ protected:
class ListBranchNode : public BranchNode {
public:
ListBranchNode() : BranchNode(0x444444), length(0) {}
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
virtual void write(StringTrieBuilder &builder);
// Adds a unit with a final value.
@ -376,7 +376,7 @@ protected:
: BranchNode(((0x555555u*37u+middleUnit)*37u+
hashCode(lessThanNode))*37u+hashCode(greaterOrEqualNode)),
unit(middleUnit), lessThan(lessThanNode), greaterOrEqual(greaterOrEqualNode) {}
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
virtual void write(StringTrieBuilder &builder);
protected:
@ -392,7 +392,7 @@ protected:
BranchHeadNode(int32_t len, Node *subNode)
: ValueNode((0x666666u*37u+len)*37u+hashCode(subNode)),
length(len), next(subNode) {}
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
virtual void write(StringTrieBuilder &builder);
protected:

2
icu4c/source/common/unicode/ucharstriebuilder.h
View file

@ -157,7 +157,7 @@ private:
class UCTLinearMatchNode : public LinearMatchNode {
public:
UCTLinearMatchNode(const char16_t *units, int32_t len, Node *nextNode);
virtual UBool operator==(const Node &other) const;
virtual bool operator==(const Node &other) const;
virtual void write(StringTrieBuilder &builder);
private:
const char16_t *s;

2
icu4c/source/common/unicode/uchriter.h
View file

@ -119,7 +119,7 @@ public:
* same string and are pointing at the same character.
* @stable ICU 2.0
*/
virtual UBool operator==(const ForwardCharacterIterator& that) const;
virtual bool operator==(const ForwardCharacterIterator& that) const;
/**
* Generates a hash code for this iterator.

6
icu4c/source/common/unicode/uniset.h
View file

@ -485,14 +485,14 @@ public:
* @return <tt>true</tt> if the specified set is equal to this set.
* @stable ICU 2.0
*/
virtual UBool operator==(const UnicodeSet& o) const;
virtual bool operator==(const UnicodeSet& o) const;
/**
* Compares the specified object with this set for equality. Returns
* <tt>true</tt> if the specified set is not equal to this set.
* @stable ICU 2.0
*/
inline UBool operator!=(const UnicodeSet& o) const;
inline bool operator!=(const UnicodeSet& o) const;
/**
* Returns a copy of this object. All UnicodeFunctor objects have
@ -1710,7 +1710,7 @@ private:
inline UBool UnicodeSet::operator!=(const UnicodeSet& o) const {
inline bool UnicodeSet::operator!=(const UnicodeSet& o) const {
return !operator==(o);
}

8
icu4c/source/common/unicode/unistr.h
View file

@ -325,7 +325,7 @@ public:
* false otherwise.
* @stable ICU 2.0
*/
inline UBool operator== (const UnicodeString& text) const;
inline bool operator== (const UnicodeString& text) const;
/**
* Inequality operator. Performs only bitwise comparison.
@ -334,7 +334,7 @@ public:
* true otherwise.
* @stable ICU 2.0
*/
inline UBool operator!= (const UnicodeString& text) const;
inline bool operator!= (const UnicodeString& text) const;
/**
* Greater than operator. Performs only bitwise comparison.
@ -3946,7 +3946,7 @@ UnicodeString::doCompare(int32_t start,
}
}
inline UBool
inline bool
UnicodeString::operator== (const UnicodeString& text) const
{
if(isBogus()) {
@ -3957,7 +3957,7 @@ UnicodeString::operator== (const UnicodeString& text) const
}
}
inline UBool
inline bool
UnicodeString::operator!= (const UnicodeString& text) const
{ return (! operator==(text)); }

4
icu4c/source/common/unicode/uobject.h
View file

@ -262,8 +262,8 @@ protected:
// UObject &operator=(const UObject &other) { return *this; }
// comparison operators
virtual inline UBool operator==(const UObject &other) const { return this==&other; }
inline UBool operator!=(const UObject &other) const { return !operator==(other); }
virtual inline bool operator==(const UObject &other) const { return this==&other; }
inline bool operator!=(const UObject &other) const { return !operator==(other); }
// clone() commented out from the base class:
// some compilers do not support co-variant return types

8
icu4c/source/common/unifiedcache.h
View file

@ -56,7 +56,7 @@ class U_COMMON_API CacheKeyBase : public UObject {
/**
* Equality operator.
*/
virtual UBool operator == (const CacheKeyBase &other) const = 0;
virtual bool operator == (const CacheKeyBase &other) const = 0;
/**
* Create a new object for this key. Called by cache on cache miss.
@ -83,7 +83,7 @@ class U_COMMON_API CacheKeyBase : public UObject {
/**
* Inequality operator.
*/
UBool operator != (const CacheKeyBase &other) const {
bool operator != (const CacheKeyBase &other) const {
return !(*this == other);
}
private:
@ -123,7 +123,7 @@ class CacheKey : public CacheKeyBase {
/**
* Two objects are equal if they are of the same type.
*/
virtual UBool operator == (const CacheKeyBase &other) const {
virtual bool operator == (const CacheKeyBase &other) const {
return typeid(*this) == typeid(other);
}
};
@ -144,7 +144,7 @@ class LocaleCacheKey : public CacheKey<T> {
virtual int32_t hashCode() const {
return (int32_t)(37u * (uint32_t)CacheKey<T>::hashCode() + (uint32_t)fLoc.hashCode());
}
virtual UBool operator == (const CacheKeyBase &other) const {
virtual bool operator == (const CacheKeyBase &other) const {
// reflexive
if (this == &other) {
return true;

2
icu4c/source/common/uniset.cpp
View file

@ -278,7 +278,7 @@ UnicodeSet *UnicodeSet::cloneAsThawed() const {
* @param o set to be compared for equality with this set.
* @return <tt>true</tt> if the specified set is equal to this set.
*/
UBool UnicodeSet::operator==(const UnicodeSet& o) const {
bool UnicodeSet::operator==(const UnicodeSet& o) const {
if (len != o.len) return FALSE;
for (int32_t i = 0; i < len; ++i) {
if (list[i] != o.list[i]) return FALSE;

4
icu4c/source/common/ustr_titlecase_brkiter.cpp
View file

@ -44,7 +44,7 @@ class WholeStringBreakIterator : public BreakIterator {
public:
WholeStringBreakIterator() : BreakIterator(), length(0) {}
~WholeStringBreakIterator() U_OVERRIDE;
UBool operator==(const BreakIterator&) const U_OVERRIDE;
bool operator==(const BreakIterator&) const U_OVERRIDE;
WholeStringBreakIterator *clone() const U_OVERRIDE;
static UClassID U_EXPORT2 getStaticClassID();
UClassID getDynamicClassID() const U_OVERRIDE;
@ -73,7 +73,7 @@ private:
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(WholeStringBreakIterator)
WholeStringBreakIterator::~WholeStringBreakIterator() {}
UBool WholeStringBreakIterator::operator==(const BreakIterator&) const { return FALSE; }
bool WholeStringBreakIterator::operator==(const BreakIterator&) const { return FALSE; }
WholeStringBreakIterator *WholeStringBreakIterator::clone() const { return nullptr; }
CharacterIterator &WholeStringBreakIterator::getText() const {

4
icu4c/source/common/ustrenum.cpp
View file

@ -120,12 +120,12 @@ StringEnumeration::setChars(const char *s, int32_t length, UErrorCode &status) {
return NULL;
}
UBool
bool
StringEnumeration::operator==(const StringEnumeration& that)const {
return typeid(*this) == typeid(that);
}
UBool
bool
StringEnumeration::operator!=(const StringEnumeration& that)const {
return !operator==(that);
}

2
icu4c/source/common/uvector.cpp
View file

@ -110,7 +110,7 @@ void UVector::assign(const UVector& other, UElementAssigner *assign, UErrorCode
}
// This only does something sensible if this object has a non-null comparer
UBool UVector::operator==(const UVector& other) {
bool UVector::operator==(const UVector& other) {
int32_t i;
if (count != other.count) return FALSE;
if (comparer != NULL) {

6
icu4c/source/common/uvector.h
View file

@ -113,12 +113,12 @@ public:
* equal if they are of the same size and all elements are equal,
* as compared using this object's comparer.
*/
UBool operator==(const UVector& other);
bool operator==(const UVector& other);
/**
* Equivalent to !operator==()
*/
inline UBool operator!=(const UVector& other);
inline bool operator!=(const UVector& other);
//------------------------------------------------------------
// java.util.Vector API
@ -390,7 +390,7 @@ inline void* UVector::operator[](int32_t index) const {
return elementAt(index);
}
inline UBool UVector::operator!=(const UVector& other) {
inline bool UVector::operator!=(const UVector& other) {
return !operator==(other);
}

2
icu4c/source/common/uvectr32.cpp
View file

@ -83,7 +83,7 @@ void UVector32::assign(const UVector32& other, UErrorCode &ec) {
}
UBool UVector32::operator==(const UVector32& other) {
bool UVector32::operator==(const UVector32& other) {
int32_t i;
if (count != other.count) return FALSE;
for (i=0; i<count; ++i) {

6
icu4c/source/common/uvectr32.h
View file

@ -86,12 +86,12 @@ public:
* equal if they are of the same size and all elements are equal,
* as compared using this object's comparer.
*/
UBool operator==(const UVector32& other);
bool operator==(const UVector32& other);
/**
* Equivalent to !operator==()
*/
inline UBool operator!=(const UVector32& other);
inline bool operator!=(const UVector32& other);
//------------------------------------------------------------
// java.util.Vector API
@ -268,7 +268,7 @@ inline int32_t UVector32::lastElementi(void) const {
return elementAti(count-1);
}
inline UBool UVector32::operator!=(const UVector32& other) {
inline bool UVector32::operator!=(const UVector32& other) {
return !operator==(other);
}

2
icu4c/source/common/uvectr64.cpp
View file

@ -80,7 +80,7 @@ void UVector64::assign(const UVector64& other, UErrorCode &ec) {
}
UBool UVector64::operator==(const UVector64& other) {
bool UVector64::operator==(const UVector64& other) {
int32_t i;
if (count != other.count) return FALSE;
for (i=0; i<count; ++i) {

6
icu4c/source/common/uvectr64.h
View file

@ -85,12 +85,12 @@ public:
* equal if they are of the same size and all elements are equal,
* as compared using this object's comparer.
*/
UBool operator==(const UVector64& other);
bool operator==(const UVector64& other);
/**
* Equivalent to !operator==()
*/
inline UBool operator!=(const UVector64& other);
inline bool operator!=(const UVector64& other);
//------------------------------------------------------------
// subset of java.util.Vector API
@ -249,7 +249,7 @@ inline int64_t UVector64::lastElementi(void) const {
return elementAti(count-1);
}
inline UBool UVector64::operator!=(const UVector64& other) {
inline bool UVector64::operator!=(const UVector64& other) {
return !operator==(other);
}

4
icu4c/source/i18n/alphaindex.cpp
View file

@ -799,12 +799,12 @@ UnicodeString AlphabeticIndex::separated(const UnicodeString &item) {
}
UBool AlphabeticIndex::operator==(const AlphabeticIndex& /* other */) const {
bool AlphabeticIndex::operator==(const AlphabeticIndex& /* other */) const {
return FALSE;
}
UBool AlphabeticIndex::operator!=(const AlphabeticIndex& /* other */) const {
bool AlphabeticIndex::operator!=(const AlphabeticIndex& /* other */) const {
return FALSE;
}

2
icu4c/source/i18n/calendar.cpp
View file

@ -1031,7 +1031,7 @@ Calendar::getCalendarTypeFromLocale(
}
}
UBool
bool
Calendar::operator==(const Calendar& that) const
{
UErrorCode status = U_ZERO_ERROR;

2
icu4c/source/i18n/choicfmt.cpp
View file

@ -132,7 +132,7 @@ ChoiceFormat::ChoiceFormat(const UnicodeString& newPattern,
}
// -------------------------------------
UBool
bool
ChoiceFormat::operator==(const Format& that) const
{
if (this == &that) return TRUE;

4
icu4c/source/i18n/coleitr.cpp
View file

@ -137,13 +137,13 @@ int32_t CollationElementIterator::next(UErrorCode& status)
return firstHalf;
}
UBool CollationElementIterator::operator!=(
bool CollationElementIterator::operator!=(
const CollationElementIterator& other) const
{
return !(*this == other);
}
UBool CollationElementIterator::operator==(
bool CollationElementIterator::operator==(
const CollationElementIterator& that) const
{
if (this == &that) {

6
icu4c/source/i18n/coll.cpp
View file

@ -636,15 +636,15 @@ Collator::Collator(const Collator &other)
{
}
UBool Collator::operator==(const Collator& other) const
bool Collator::operator==(const Collator& other) const
{
// Subclasses: Call this method and then add more specific checks.
return typeid(*this) == typeid(other);
}
UBool Collator::operator!=(const Collator& other) const
bool Collator::operator!=(const Collator& other) const
{
return (UBool)!(*this == other);
return !operator==(other);
}
int32_t U_EXPORT2 Collator::getBound(const uint8_t *source,

2
icu4c/source/i18n/collationiterator.cpp
View file

@ -168,7 +168,7 @@ CollationIterator::~CollationIterator() {
delete skipped;
}
UBool
bool
CollationIterator::operator==(const CollationIterator &other) const {
// Subclasses: Call this method and then add more specific checks.
// Compare the iterator state but not the collation data (trie & data fields):

4
icu4c/source/i18n/collationiterator.h
View file

@ -109,8 +109,8 @@ public:
virtual ~CollationIterator();
virtual UBool operator==(const CollationIterator &other) const;
inline UBool operator!=(const CollationIterator &other) const {
virtual bool operator==(const CollationIterator &other) const;
inline bool operator!=(const CollationIterator &other) const {
return !operator==(other);
}

2
icu4c/source/i18n/collationsettings.cpp
View file

@ -48,7 +48,7 @@ CollationSettings::~CollationSettings() {
}
}
UBool
bool
CollationSettings::operator==(const CollationSettings &other) const {
if(options != other.options) { return FALSE; }
if((options & ALTERNATE_MASK) != 0 && variableTop != other.variableTop) { return FALSE; }

4
icu4c/source/i18n/collationsettings.h
View file

@ -115,9 +115,9 @@ struct U_I18N_API CollationSettings : public SharedObject {
CollationSettings(const CollationSettings &other);
virtual ~CollationSettings();
UBool operator==(const CollationSettings &other) const;
bool operator==(const CollationSettings &other) const;
inline UBool operator!=(const CollationSettings &other) const {
inline bool operator!=(const CollationSettings &other) const {
return !operator==(other);
}

2
icu4c/source/i18n/currpinf.cpp
View file

@ -145,7 +145,7 @@ CurrencyPluralInfo::~CurrencyPluralInfo() {
fLocale = nullptr;
}
UBool
bool
CurrencyPluralInfo::operator==(const CurrencyPluralInfo& info) const {
#ifdef CURRENCY_PLURAL_INFO_DEBUG
if (*fPluralRules == *info.fPluralRules) {

4
icu4c/source/i18n/datefmt.cpp
View file

@ -82,7 +82,7 @@ public:
virtual int32_t hashCode() const {
return (int32_t)(37u * (uint32_t)LocaleCacheKey<DateFmtBestPattern>::hashCode() + (uint32_t)fSkeleton.hashCode());
}
virtual UBool operator==(const CacheKeyBase &other) const {
virtual bool operator==(const CacheKeyBase &other) const {
// reflexive
if (this == &other) {
return TRUE;
@ -174,7 +174,7 @@ DateFormat::~DateFormat()
//----------------------------------------------------------------------
UBool
bool
DateFormat::operator==(const Format& other) const
{
// This protected comparison operator should only be called by subclasses

2
icu4c/source/i18n/dcfmtsym.cpp
View file

@ -174,7 +174,7 @@ DecimalFormatSymbols::operator=(const DecimalFormatSymbols& rhs)
// -------------------------------------
UBool
bool
DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
{
if (this == &that) {

2
icu4c/source/i18n/decimfmt.cpp
View file

@ -497,7 +497,7 @@ DecimalFormat* DecimalFormat::clone() const {
return nullptr;
}
UBool DecimalFormat::operator==(const Format& other) const {
bool DecimalFormat::operator==(const Format& other) const {
auto* otherDF = dynamic_cast<const DecimalFormat*>(&other);
if (otherDF == nullptr) {
return false;

2
icu4c/source/i18n/dtfmtsym.cpp
View file

@ -539,7 +539,7 @@ DateFormatSymbols::arrayCompare(const UnicodeString* array1,
return TRUE;
}
UBool
bool
DateFormatSymbols::operator==(const DateFormatSymbols& other) const
{
// First do cheap comparisons

2
icu4c/source/i18n/dtitvfmt.cpp
View file

@ -229,7 +229,7 @@ DateIntervalFormat::clone() const {
}
UBool
bool
DateIntervalFormat::operator==(const Format& other) const {
if (typeid(*this) != typeid(other)) {return FALSE;}
const DateIntervalFormat* fmt = (DateIntervalFormat*)&other;

2
icu4c/source/i18n/dtitvinf.cpp
View file

@ -165,7 +165,7 @@ DateIntervalInfo::~DateIntervalInfo() {
}
UBool
bool
DateIntervalInfo::operator==(const DateIntervalInfo& other) const {
UBool equal = (
fFallbackIntervalPattern == other.fFallbackIntervalPattern &&

4
icu4c/source/i18n/dtptngen.cpp
View file

@ -424,7 +424,7 @@ DateTimePatternGenerator::operator=(const DateTimePatternGenerator& other) {
}
UBool
bool
DateTimePatternGenerator::operator==(const DateTimePatternGenerator& other) const {
if (this == &other) {
return TRUE;
@ -448,7 +448,7 @@ DateTimePatternGenerator::operator==(const DateTimePatternGenerator& other) cons
}
}
UBool
bool
DateTimePatternGenerator::operator!=(const DateTimePatternGenerator& other) const {
return !operator==(other);
}

8
icu4c/source/i18n/dtptngen_impl.h
View file

@ -134,20 +134,20 @@ public:
UnicodeString& appendTo(UnicodeString& string) const;
UnicodeString& appendFieldTo(int32_t field, UnicodeString& string) const;
UChar getFirstChar() const;
inline UBool operator==(const SkeletonFields& other) const;
inline UBool operator!=(const SkeletonFields& other) const;
inline bool operator==(const SkeletonFields& other) const;
inline bool operator!=(const SkeletonFields& other) const;
private:
int8_t chars[UDATPG_FIELD_COUNT];
int8_t lengths[UDATPG_FIELD_COUNT];
};
inline UBool SkeletonFields::operator==(const SkeletonFields& other) const {
inline bool SkeletonFields::operator==(const SkeletonFields& other) const {
return (uprv_memcmp(chars, other.chars, sizeof(chars)) == 0
&& uprv_memcmp(lengths, other.lengths, sizeof(lengths)) == 0);
}
inline UBool SkeletonFields::operator!=(const SkeletonFields& other) const {
inline bool SkeletonFields::operator!=(const SkeletonFields& other) const {
return (! operator==(other));
}

4
icu4c/source/i18n/dtrule.cpp
View file

@ -81,7 +81,7 @@ DateTimeRule::operator=(const DateTimeRule& right) {
return *this;
}
UBool
bool
DateTimeRule::operator==(const DateTimeRule& that) const {
return ((this == &that) ||
(typeid(*this) == typeid(that) &&
@ -94,7 +94,7 @@ DateTimeRule::operator==(const DateTimeRule& that) const {
fTimeRuleType == that.fTimeRuleType));
}
UBool
bool
DateTimeRule::operator!=(const DateTimeRule& that) const {
return !operator==(that);
}

2
icu4c/source/i18n/fmtable.cpp
View file

@ -275,7 +275,7 @@ Formattable::operator=(const Formattable& source)
// -------------------------------------
UBool
bool
Formattable::operator==(const Formattable& that) const
{
int32_t i;

2
icu4c/source/i18n/format.cpp
View file

@ -155,7 +155,7 @@ Format::parseObject(const UnicodeString& source,
// -------------------------------------
UBool
bool
Format::operator==(const Format& that) const
{
// Subclasses: Call this method and then add more specific checks.

2
icu4c/source/i18n/fpositer.cpp
View file

@ -45,7 +45,7 @@ FieldPositionIterator::FieldPositionIterator(const FieldPositionIterator &rhs)
}
}
UBool FieldPositionIterator::operator==(const FieldPositionIterator &rhs) const {
bool FieldPositionIterator::operator==(const FieldPositionIterator &rhs) const {
if (&rhs == this) {
return TRUE;
}

2
icu4c/source/i18n/measfmt.cpp
View file

@ -427,7 +427,7 @@ MeasureFormat::~MeasureFormat() {
delete listFormatter;
}
UBool MeasureFormat::operator==(const Format &other) const {
bool MeasureFormat::operator==(const Format &other) const {
if (this == &other) { // Same object, equal
return TRUE;
}

2
icu4c/source/i18n/measunit.cpp
View file

@ -2196,7 +2196,7 @@ const char *MeasureUnit::getIdentifier() const {
return fImpl ? fImpl->identifier.data() : gSubTypes[getOffset()];
}
UBool MeasureUnit::operator==(const UObject& other) const {
bool MeasureUnit::operator==(const UObject& other) const {
if (this == &other) { // Same object, equal
return TRUE;
}

2
icu4c/source/i18n/measure.cpp
View file

@ -60,7 +60,7 @@ Measure::~Measure() {
delete unit;
}
UBool Measure::operator==(const UObject& other) const {
bool Measure::operator==(const UObject& other) const {
if (this == &other) { // Same object, equal
return TRUE;
}

4
icu4c/source/i18n/msgfmt.cpp
View file

@ -389,7 +389,7 @@ MessageFormat::operator=(const MessageFormat& that)
return *this;
}
UBool
bool
MessageFormat::operator==(const Format& rhs) const
{
if (this == &rhs) return TRUE;
@ -1869,7 +1869,7 @@ UBool MessageFormat::equalFormats(const void* left, const void* right) {
}
UBool MessageFormat::DummyFormat::operator==(const Format&) const {
bool MessageFormat::DummyFormat::operator==(const Format&) const {
return TRUE;
}

2
icu4c/source/i18n/nfrs.cpp
View file

@ -344,7 +344,7 @@ util_equalRules(const NFRule* rule1, const NFRule* rule2)
return FALSE;
}
UBool
bool
NFRuleSet::operator==(const NFRuleSet& rhs) const
{
if (rules.size() == rhs.rules.size() &&

4
icu4c/source/i18n/nfrs.h
View file

@ -40,8 +40,8 @@ public:
~NFRuleSet();
UBool operator==(const NFRuleSet& rhs) const;
UBool operator!=(const NFRuleSet& rhs) const { return !operator==(rhs); }
bool operator==(const NFRuleSet& rhs) const;
bool operator!=(const NFRuleSet& rhs) const { return !operator==(rhs); }
UBool isPublic() const { return fIsPublic; }

2
icu4c/source/i18n/nfrule.cpp
View file

@ -631,7 +631,7 @@ util_equalSubstitutions(const NFSubstitution* sub1, const NFSubstitution* sub2)
* @param that The rule to compare this one against
* @return True is the two rules are functionally equivalent
*/
UBool
bool
NFRule::operator==(const NFRule& rhs) const
{
return baseValue == rhs.baseValue

4
icu4c/source/i18n/nfrule.h
View file

@ -54,8 +54,8 @@ public:
NFRule(const RuleBasedNumberFormat* rbnf, const UnicodeString &ruleText, UErrorCode &status);
~NFRule();
UBool operator==(const NFRule& rhs) const;
UBool operator!=(const NFRule& rhs) const { return !operator==(rhs); }
bool operator==(const NFRule& rhs) const;
bool operator!=(const NFRule& rhs) const { return !operator==(rhs); }
ERuleType getType() const { return (ERuleType)(baseValue <= kNoBase ? (ERuleType)baseValue : kOtherRule); }
void setType(ERuleType ruleType) { baseValue = (int32_t)ruleType; }

18
icu4c/source/i18n/nfsubs.cpp
View file

@ -96,7 +96,7 @@ public:
}
}
virtual UBool operator==(const NFSubstitution& rhs) const;
virtual bool operator==(const NFSubstitution& rhs) const;
virtual int64_t transformNumber(int64_t number) const {
return number / divisor;
@ -145,7 +145,7 @@ public:
}
}
virtual UBool operator==(const NFSubstitution& rhs) const;
virtual bool operator==(const NFSubstitution& rhs) const;
virtual void doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t pos, int32_t recursionCount, UErrorCode& status) const;
virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos, int32_t recursionCount, UErrorCode& status) const;
@ -213,7 +213,7 @@ public:
UErrorCode& status);
virtual ~FractionalPartSubstitution();
virtual UBool operator==(const NFSubstitution& rhs) const;
virtual bool operator==(const NFSubstitution& rhs) const;
virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos, int32_t recursionCount, UErrorCode& status) const;
virtual void doSubstitution(int64_t /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/, int32_t /*recursionCount*/, UErrorCode& /*status*/) const {}
@ -285,7 +285,7 @@ public:
}
virtual ~NumeratorSubstitution();
virtual UBool operator==(const NFSubstitution& rhs) const;
virtual bool operator==(const NFSubstitution& rhs) const;
virtual int64_t transformNumber(int64_t number) const { return number * ldenominator; }
virtual double transformNumber(double number) const { return uprv_round(number * denominator); }
@ -515,7 +515,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(NFSubstitution)
* @param The substitution to compare this one to
* @return true if the two substitutions are functionally equivalent
*/
UBool
bool
NFSubstitution::operator==(const NFSubstitution& rhs) const
{
// compare class and all of the fields all substitutions have
@ -810,7 +810,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SameValueSubstitution)
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(MultiplierSubstitution)
UBool MultiplierSubstitution::operator==(const NFSubstitution& rhs) const
bool MultiplierSubstitution::operator==(const NFSubstitution& rhs) const
{
return NFSubstitution::operator==(rhs) &&
divisor == ((const MultiplierSubstitution*)&rhs)->divisor;
@ -856,7 +856,7 @@ ModulusSubstitution::ModulusSubstitution(int32_t _pos,
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(ModulusSubstitution)
UBool ModulusSubstitution::operator==(const NFSubstitution& rhs) const
bool ModulusSubstitution::operator==(const NFSubstitution& rhs) const
{
return NFSubstitution::operator==(rhs) &&
divisor == ((const ModulusSubstitution*)&rhs)->divisor &&
@ -1195,7 +1195,7 @@ FractionalPartSubstitution::doParse(const UnicodeString& text,
}
}
UBool
bool
FractionalPartSubstitution::operator==(const NFSubstitution& rhs) const
{
return NFSubstitution::operator==(rhs) &&
@ -1327,7 +1327,7 @@ NumeratorSubstitution::doParse(const UnicodeString& text,
return TRUE;
}
UBool
bool
NumeratorSubstitution::operator==(const NFSubstitution& rhs) const
{
return NFSubstitution::operator==(rhs) &&

4
icu4c/source/i18n/nfsubs.h
View file

@ -74,7 +74,7 @@ public:
* @param rhs the object to be compared with.
* @return true if the given Format objects are semantically equal.
*/
virtual UBool operator==(const NFSubstitution& rhs) const;
virtual bool operator==(const NFSubstitution& rhs) const;
/**
* Return true if the given Format objects are semantically unequal.
@ -82,7 +82,7 @@ public:
* @param rhs the object to be compared with.
* @return true if the given Format objects are semantically unequal.
*/
UBool operator!=(const NFSubstitution& rhs) const { return !operator==(rhs); }
bool operator!=(const NFSubstitution& rhs) const { return !operator==(rhs); }
/**
* Sets the substitution's divisor. Used by NFRule.setBaseValue().

2
icu4c/source/i18n/number_asformat.cpp
View file

@ -32,7 +32,7 @@ LocalizedNumberFormatterAsFormat::LocalizedNumberFormatterAsFormat(
LocalizedNumberFormatterAsFormat::~LocalizedNumberFormatterAsFormat() = default;
UBool LocalizedNumberFormatterAsFormat::operator==(const Format& other) const {
bool LocalizedNumberFormatterAsFormat::operator==(const Format& other) const {
auto* _other = dynamic_cast<const LocalizedNumberFormatterAsFormat*>(&other);
if (_other == nullptr) {
return false;

2
icu4c/source/i18n/number_asformat.h
View file

@ -39,7 +39,7 @@ class U_I18N_API LocalizedNumberFormatterAsFormat : public Format {
/**
* Equals operator.
*/
UBool operator==(const Format& other) const U_OVERRIDE;
bool operator==(const Format& other) const U_OVERRIDE;
/**
* Creates a copy of this object.

2
icu4c/source/i18n/numfmt.cpp
View file

@ -285,7 +285,7 @@ NumberFormat::operator=(const NumberFormat& rhs)
// -------------------------------------
UBool
bool
NumberFormat::operator==(const Format& that) const
{
// Format::operator== guarantees this cast is safe

2
icu4c/source/i18n/olsontz.cpp
View file

@ -311,7 +311,7 @@ OlsonTimeZone::~OlsonTimeZone() {
/**
* Returns true if the two TimeZone objects are equal.
*/
UBool OlsonTimeZone::operator==(const TimeZone& other) const {
bool OlsonTimeZone::operator==(const TimeZone& other) const {
return ((this == &other) ||
(typeid(*this) == typeid(other) &&
TimeZone::operator==(other) &&

2
icu4c/source/i18n/olsontz.h
View file

@ -146,7 +146,7 @@ class U_I18N_API OlsonTimeZone: public BasicTimeZone {
/**
* Returns true if the two TimeZone objects are equal.
*/
virtual UBool operator==(const TimeZone& other) const;
virtual bool operator==(const TimeZone& other) const;
/**
* TimeZone API.

4
icu4c/source/i18n/plurfmt.cpp
View file

@ -381,7 +381,7 @@ PluralFormat::operator=(const PluralFormat& other) {
return *this;
}
UBool
bool
PluralFormat::operator==(const Format& other) const {
if (this == &other) {
return TRUE;
@ -400,7 +400,7 @@ PluralFormat::operator==(const Format& other) const {
*pluralRulesWrapper.pluralRules == *o.pluralRulesWrapper.pluralRules);
}
UBool
bool
PluralFormat::operator!=(const Format& other) const {
return !operator==(other);
}

2
icu4c/source/i18n/plurrule.cpp
View file

@ -547,7 +547,7 @@ PluralRules::getKeywordOther() const {
return UnicodeString(TRUE, PLURAL_KEYWORD_OTHER, 5);
}
UBool
bool
PluralRules::operator==(const PluralRules& other) const {
const UnicodeString *ptrKeyword;
UErrorCode status= U_ZERO_ERROR;

8
icu4c/source/i18n/rbnf.cpp
View file

@ -99,8 +99,8 @@ public:
return NULL;
}
virtual UBool operator==(const LocalizationInfo* rhs) const;
inline UBool operator!=(const LocalizationInfo* rhs) const { return !operator==(rhs); }
virtual bool operator==(const LocalizationInfo* rhs) const;
inline bool operator!=(const LocalizationInfo* rhs) const { return !operator==(rhs); }
virtual int32_t getNumberOfRuleSets(void) const = 0;
virtual const UChar* getRuleSetName(int32_t index) const = 0;
@ -131,7 +131,7 @@ streq(const UChar* lhs, const UChar* rhs) {
return FALSE;
}
UBool
bool
LocalizationInfo::operator==(const LocalizationInfo* rhs) const {
if (rhs) {
if (this == rhs) {
@ -936,7 +936,7 @@ RuleBasedNumberFormat::clone() const
return new RuleBasedNumberFormat(*this);
}
UBool
bool
RuleBasedNumberFormat::operator==(const Format& other) const
{
if (this == &other) {

4
icu4c/source/i18n/rbtz.cpp
View file

@ -88,7 +88,7 @@ RuleBasedTimeZone::operator=(const RuleBasedTimeZone& right) {
return *this;
}
UBool
bool
RuleBasedTimeZone::operator==(const TimeZone& that) const {
if (this == &that) {
return TRUE;
@ -108,7 +108,7 @@ RuleBasedTimeZone::operator==(const TimeZone& that) const {
return FALSE;
}
UBool
bool
RuleBasedTimeZone::operator!=(const TimeZone& that) const {
return !operator==(that);
}

4
icu4c/source/i18n/region.cpp
View file

@ -449,7 +449,7 @@ Region::~Region () {
* Returns true if the two regions are equal.
* Per PMC, just use pointer compare, since we have at most one instance of each Region.
*/
UBool
bool
Region::operator==(const Region &that) const {
return (idStr == that.idStr);
}
@ -458,7 +458,7 @@ Region::operator==(const Region &that) const {
* Returns true if the two regions are NOT equal; that is, if operator ==() returns false.
* Per PMC, just use pointer compare, since we have at most one instance of each Region.
*/
UBool
bool
Region::operator!=(const Region &that) const {
return (idStr != that.idStr);
}

2
icu4c/source/i18n/reldtfmt.cpp
View file

@ -135,7 +135,7 @@ RelativeDateFormat* RelativeDateFormat::clone() const {
return new RelativeDateFormat(*this);
}
UBool RelativeDateFormat::operator==(const Format& other) const {
bool RelativeDateFormat::operator==(const Format& other) const {
if(DateFormat::operator==(other)) {
// The DateFormat::operator== check for fCapitalizationContext equality above
// is sufficient to check equality of all derived context-related data.

2
icu4c/source/i18n/reldtfmt.h
View file

@ -80,7 +80,7 @@ public:
* @return true if the given Format objects are semantically equal.
* @internal ICU 3.8
*/
virtual UBool operator==(const Format& other) const;
virtual bool operator==(const Format& other) const;
using DateFormat::format;

2
icu4c/source/i18n/repattrn.cpp
View file

@ -291,7 +291,7 @@ RegexPattern *RegexPattern::clone() const {
// characters can still be considered different.
//
//--------------------------------------------------------------------------
UBool RegexPattern::operator ==(const RegexPattern &other) const {
bool RegexPattern::operator ==(const RegexPattern &other) const {
if (this->fFlags == other.fFlags && this->fDeferredStatus == other.fDeferredStatus) {
if (this->fPatternString != NULL && other.fPatternString != NULL) {
return *(this->fPatternString) == *(other.fPatternString);

2
icu4c/source/i18n/rulebasedcollator.cpp
View file

@ -239,7 +239,7 @@ RuleBasedCollator &RuleBasedCollator::operator=(const RuleBasedCollator &other)
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RuleBasedCollator)
UBool
bool
RuleBasedCollator::operator==(const Collator& other) const {
if(this == &other) { return TRUE; }
if(!Collator::operator==(other)) { return FALSE; }

2
icu4c/source/i18n/scriptset.cpp
View file

@ -44,7 +44,7 @@ ScriptSet & ScriptSet::operator =(const ScriptSet &other) {
return *this;
}
UBool ScriptSet::operator == (const ScriptSet &other) const {
bool ScriptSet::operator == (const ScriptSet &other) const {
for (uint32_t i=0; i<UPRV_LENGTHOF(bits); i++) {
if (bits[i] != other.bits[i]) {
return FALSE;

4
icu4c/source/i18n/scriptset.h
View file

@ -41,8 +41,8 @@ class U_I18N_API ScriptSet: public UMemory {
ScriptSet(const ScriptSet &other);
~ScriptSet();
UBool operator == (const ScriptSet &other) const;
UBool operator != (const ScriptSet &other) const {return !(*this == other);}
bool operator == (const ScriptSet &other) const;
bool operator != (const ScriptSet &other) const {return !(*this == other);}
ScriptSet & operator = (const ScriptSet &other);
UBool test(UScriptCode script, UErrorCode &status) const;

2
icu4c/source/i18n/search.cpp
View file

@ -178,7 +178,7 @@ const UnicodeString & SearchIterator::getText(void) const
// operator overloading ----------------------------------------------
UBool SearchIterator::operator==(const SearchIterator &that) const
bool SearchIterator::operator==(const SearchIterator &that) const
{
if (this == &that) {
return TRUE;

4
icu4c/source/i18n/selfmt.cpp
View file

@ -164,7 +164,7 @@ SelectFormat::operator=(const SelectFormat& other) {
return *this;
}
UBool
bool
SelectFormat::operator==(const Format& other) const {
if (this == &other) {
return TRUE;
@ -176,7 +176,7 @@ SelectFormat::operator==(const Format& other) const {
return msgPattern == o.msgPattern;
}
UBool
bool
SelectFormat::operator!=(const Format& other) const {
return !operator==(other);
}

2
icu4c/source/i18n/simpletz.cpp
View file

@ -231,7 +231,7 @@ SimpleTimeZone::operator=(const SimpleTimeZone &right)
// -------------------------------------
UBool
bool
SimpleTimeZone::operator==(const TimeZone& that) const
{
return ((this == &that) ||

2
icu4c/source/i18n/smpdtfmt.cpp
View file

@ -658,7 +658,7 @@ SimpleDateFormat::clone() const
//----------------------------------------------------------------------
UBool
bool
SimpleDateFormat::operator==(const Format& other) const
{
if (DateFormat::operator==(other)) {

2
icu4c/source/i18n/sortkey.cpp
View file

@ -137,7 +137,7 @@ CollationKey::setToBogus()
return *this;
}
UBool
bool
CollationKey::operator==(const CollationKey& source) const
{
return getLength() == source.getLength() &&

2
icu4c/source/i18n/stsearch.cpp
View file

@ -205,7 +205,7 @@ StringSearch & StringSearch::operator=(const StringSearch &that)
return *this;
}
UBool StringSearch::operator==(const SearchIterator &that) const
bool StringSearch::operator==(const SearchIterator &that) const
{
if (this == &that) {
return TRUE;

2
icu4c/source/i18n/timezone.cpp
View file

@ -376,7 +376,7 @@ TimeZone::operator=(const TimeZone &right)
// -------------------------------------
UBool
bool
TimeZone::operator==(const TimeZone& that) const
{
return typeid(*this) == typeid(that) &&

2
icu4c/source/i18n/tmutamt.cpp
View file

@ -45,7 +45,7 @@ TimeUnitAmount::operator=(const TimeUnitAmount& other) {
}
UBool
bool
TimeUnitAmount::operator==(const UObject& other) const {
return Measure::operator==(other);
}

Some files were not shown because too many files have changed in this diff Show more