]>
Commit | Line | Data |
---|---|---|
25b3b9cc JP |
1 | From 81b3f95622b1da2433f7d1e992c3ae6ad745e704 Mon Sep 17 00:00:00 2001 |
2 | From: Ben Ramsey <ramsey@php.net> | |
3 | Date: Tue, 19 Oct 2021 23:59:11 -0500 | |
4 | Subject: [PATCH] Change UBool to bool for equality operators in ICU >= 70.1 | |
5 | ||
6 | Refer to: | |
7 | - https://github.com/unicode-org/icu/commit/633438f8da99fee815e2c61626ea779a84567a3d | |
8 | - https://github.com/unicode-org/icu/commit/f6325d49ba57ec26f320b2865ce09ca47db458d9 | |
9 | --- | |
10 | ext/intl/breakiterator/codepointiterator_internal.cpp | 4 ++++ | |
11 | ext/intl/breakiterator/codepointiterator_internal.h | 4 ++++ | |
12 | 2 files changed, 8 insertions(+) | |
13 | ||
14 | diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp | |
15 | index bf44678efc06..143c181590e9 100644 | |
16 | --- a/ext/intl/breakiterator/codepointiterator_internal.cpp | |
17 | +++ b/ext/intl/breakiterator/codepointiterator_internal.cpp | |
18 | @@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator() | |
19 | clearCurrentCharIter(); | |
20 | } | |
21 | ||
22 | +#if U_ICU_VERSION_MAJOR_NUM >= 70 | |
23 | +bool CodePointBreakIterator::operator==(const BreakIterator& that) const | |
24 | +#else | |
25 | UBool CodePointBreakIterator::operator==(const BreakIterator& that) const | |
26 | +#endif | |
27 | { | |
28 | if (typeid(*this) != typeid(that)) { | |
29 | return FALSE; | |
30 | diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h | |
31 | index 7ecf12deb5ae..0baf607782d0 100644 | |
32 | --- a/ext/intl/breakiterator/codepointiterator_internal.h | |
33 | +++ b/ext/intl/breakiterator/codepointiterator_internal.h | |
34 | @@ -39,7 +39,11 @@ namespace PHP { | |
35 | ||
36 | virtual ~CodePointBreakIterator(); | |
37 | ||
38 | +#if U_ICU_VERSION_MAJOR_NUM >= 70 | |
39 | + virtual bool operator==(const BreakIterator& that) const; | |
40 | +#else | |
41 | virtual UBool operator==(const BreakIterator& that) const; | |
42 | +#endif | |
43 | ||
44 | virtual CodePointBreakIterator* clone(void) const; | |
45 |