diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h index eb49ad3f21..bc4757d68e 100644 --- a/ext/intl/breakiterator/codepointiterator_internal.h +++ b/ext/intl/breakiterator/codepointiterator_internal.h @@ -37,7 +37,7 @@ namespace PHP { virtual ~CodePointBreakIterator(); - virtual UBool operator==(const BreakIterator& that) const; + virtual bool operator==(const BreakIterator& that) const; virtual CodePointBreakIterator* clone(void) const; diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp index 72f58e1aa7..a9eccaa7f7 100644 --- a/ext/intl/breakiterator/codepointiterator_internal.cpp +++ b/ext/intl/breakiterator/codepointiterator_internal.cpp @@ -64,20 +64,20 @@ CodePointBreakIterator::~CodePointBreakIterator() clearCurrentCharIter(); } -UBool CodePointBreakIterator::operator==(const BreakIterator& that) const +bool CodePointBreakIterator::operator==(const BreakIterator& that) const { if (typeid(*this) != typeid(that)) { - return FALSE; + return false; } const CodePointBreakIterator& that2 = static_cast(that); if (!utext_equals(this->fText, that2.fText)) { - return FALSE; + return false; } - return TRUE; + return true; } CodePointBreakIterator* CodePointBreakIterator::clone(void) const