head	1.3;
access;
symbols
	pkgsrc-2021Q4:1.2.0.2
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.1.0.8
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.6
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.4
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.2
	pkgsrc-2020Q4-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2021.12.29.06.07.32;	author taca;	state dead;
branches;
next	1.2;
commitid	ojBkNFZ4AefJCvmD;

1.2
date	2021.12.08.23.55.19;	author tnn;	state Exp;
branches;
next	1.1;
commitid	Q5EQ04gMdJo1dUjD;

1.1
date	2020.11.11.20.05.10;	author markd;	state Exp;
branches;
next	;
commitid	GzaW7A4Y69UTwvvC;


desc
@@


1.3
log
@lang/php73: remove php73

Remove php73, PHP 7.3.x is EOL on 6th December 2021.
@
text
@$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.2 2021/12/08 23:55:19 tnn Exp $

Use stdbool true/false macros.
php73-intl: fix icu>=70 fallout. Backport from php74-intl.

--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig	2021-11-16 11:18:31.000000000 +0000
+++ ext/intl/breakiterator/codepointiterator_internal.cpp
@@@@ -58,7 +58,7 @@@@ CodePointBreakIterator& CodePointBreakIt
 		return *this;
 	}
 
-	this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+	this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
 
 	//don't bother copying the character iterator, getText() is deprecated
 	clearCurrentCharIter();
@@@@ -75,20 +75,24 @@@@ CodePointBreakIterator::~CodePointBreakI
 	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;
+		return false;
 	}
 
 	const CodePointBreakIterator& that2 =
 		static_cast<const CodePointBreakIterator&>(that);
 
 	if (!utext_equals(this->fText, that2.fText)) {
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 CodePointBreakIterator* CodePointBreakIterator::clone(void) const
@@@@ -109,7 +113,7 @@@@ CharacterIterator& CodePointBreakIterato
 
 UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
 {
-	return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+	return utext_clone(fillIn, this->fText, false, true, &status);
 }
 
 void CodePointBreakIterator::setText(const UnicodeString &text)
@@@@ -128,7 +132,7 @@@@ void CodePointBreakIterator::setText(UTe
 		return;
 	}
 
-	this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+	this->fText = utext_clone(this->fText, text, false, true, &status);
 
 	clearCurrentCharIter();
 }
@@@@ -280,7 +284,7 @@@@ CodePointBreakIterator &CodePointBreakIt
 	}
 
 	int64_t pos = utext_getNativeIndex(this->fText);
-	this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+	this->fText = utext_clone(this->fText, input, false, true, &status);
 	if (U_FAILURE(status)) {
 		return *this;
 	}
@


1.2
log
@php73-intl: fix icu>=70 fallout. Backport from php74-intl.
@
text
@d1 1
a1 1
$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/11 20:05:10 markd Exp $
@


1.1
log
@php73: Fix build with ICU 68

Untested - but since the same patches work for 72 and 74, assume they work
for 73.
@
text
@d1 1
a1 1
$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/11 20:01:34 markd Exp $
d4 1
d6 1
a6 1
--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig	2020-10-27 15:01:59.000000000 +0000
d17 7
a23 1
@@@@ -78,17 +78,17 @@@@ CodePointBreakIterator::~CodePointBreakI
d25 1
d45 1
a45 1
@@@@ -109,7 +109,7 @@@@ CharacterIterator& CodePointBreakIterato
d54 1
a54 1
@@@@ -128,7 +128,7 @@@@ void CodePointBreakIterator::setText(UTe
d63 1
a63 1
@@@@ -280,7 +280,7 @@@@ CodePointBreakIterator &CodePointBreakIt
@