archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4' into PHP-8.0

Browse source 
* PHP-7.4:
  CLDR 40a0 uses a lowercase "temp" instead of "Temp" in ICU >= 70.1
  Accommodate changes to canonicalized forms in ICU >= 70.1
  Change UBool to bool for equality operators in ICU >= 70.1
This commit is contained in:
Nikita Popov 2021-11-02 16:15:25 +01:00
commit a6d14f1143
7 changed files with 437 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/intl/breakiterator/codepointiterator_internal.cpp
View file

@ -73,7 +73,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
clearCurrentCharIter();
}
#if U_ICU_VERSION_MAJOR_NUM >= 70
bool CodePointBreakIterator::operator==(const BreakIterator& that) const
#else
UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
#endif
{
if (typeid(*this) != typeid(that)) {
return false;