mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: 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:
commit
2654c3449f
7 changed files with 438 additions and 4 deletions
|
@ -37,7 +37,11 @@ namespace PHP {
|
|||
|
||||
virtual ~CodePointBreakIterator();
|
||||
|
||||
#if U_ICU_VERSION_MAJOR_NUM >= 70
|
||||
virtual bool operator==(const BreakIterator& that) const;
|
||||
#else
|
||||
virtual UBool operator==(const BreakIterator& that) const;
|
||||
#endif
|
||||
|
||||
virtual CodePointBreakIterator* clone(void) const;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue