[packages/php.git] / php-icu64.patch

diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.cpp php-7.0.33/ext/intl/breakiterator/breakiterator_class.cpp
--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/breakiterator/breakiterator_class.cpp	2021-08-23 23:37:07.399084984 +0200
@@ -38,6 +38,7 @@ extern "C" {
 }
 
 using PHP::CodePointBreakIterator;
+using icu::RuleBasedBreakIterator;
 
 /* {{{ Global variables */
 zend_class_entry *BreakIterator_ce_ptr;
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.h php-7.0.33/ext/intl/breakiterator/breakiterator_class.h
--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.h	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/breakiterator/breakiterator_class.h	2021-08-23 23:37:07.399084984 +0200
@@ -26,6 +26,8 @@
 
 #ifndef USE_BREAKITERATOR_POINTER
 typedef void BreakIterator;
+#else
+using icu::BreakIterator;
 #endif
 
 typedef struct {
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_methods.cpp php-7.0.33/ext/intl/breakiterator/breakiterator_methods.cpp
--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_methods.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/breakiterator/breakiterator_methods.cpp	2021-08-23 23:37:07.399084984 +0200
@@ -32,6 +32,8 @@ extern "C" {
 }
 
 using PHP::CodePointBreakIterator;
+using icu::BreakIterator;
+using icu::Locale;
 
 U_CFUNC PHP_METHOD(BreakIterator, __construct)
 {
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.cpp php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.cpp
--- php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.cpp	2021-08-23 23:37:07.399084984 +0200
@@ -32,6 +32,7 @@ typedef union {
 #define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr))
 
 using namespace PHP;
+using icu::UCharCharacterIterator;
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
 
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.h php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.h
--- php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.h	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.h	2021-08-23 23:37:07.399084984 +0200
@@ -18,8 +18,11 @@
 #define CODEPOINTITERATOR_INTERNAL_H
 
 #include <unicode/brkiter.h>
+#include <unicode/unistr.h>
 
-using U_ICU_NAMESPACE::BreakIterator;
+using icu::BreakIterator;
+using icu::CharacterIterator;
+using icu::UnicodeString;
 
 namespace PHP {
 
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp php-7.0.33/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
--- php-7.0.33.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp	2021-08-23 23:37:07.399084984 +0200
@@ -26,6 +26,9 @@ extern "C" {
 #include "../intl_convertcpp.h"
 #include "../intl_common.h"
 
+using icu::RuleBasedBreakIterator;
+using icu::Locale;
+
 static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
 	return (RuleBasedBreakIterator*)bio->biter;
 }
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_class.cpp php-7.0.33/ext/intl/calendar/calendar_class.cpp
--- php-7.0.33.org/ext/intl/calendar/calendar_class.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/calendar/calendar_class.cpp	2021-08-23 23:37:07.399084984 +0200
@@ -34,6 +34,9 @@ extern "C" {
 #include <assert.h>
 }
 
+using icu::GregorianCalendar;
+using icu::Locale;
+
 /* {{{ Global variables */
 zend_class_entry *Calendar_ce_ptr;
 zend_class_entry *GregorianCalendar_ce_ptr;
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_class.h php-7.0.33/ext/intl/calendar/calendar_class.h
--- php-7.0.33.org/ext/intl/calendar/calendar_class.h	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/calendar/calendar_class.h	2021-08-23 23:37:07.399084984 +0200
@@ -26,6 +26,8 @@
 
 #ifndef USE_CALENDAR_POINTER
 typedef void Calendar;
+#else
+using icu::Calendar;
 #endif
 
 typedef struct {
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_methods.cpp php-7.0.33/ext/intl/calendar/calendar_methods.cpp
--- php-7.0.33.org/ext/intl/calendar/calendar_methods.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/calendar/calendar_methods.cpp	2021-08-23 23:37:07.402418347 +0200
@@ -40,6 +40,8 @@ extern "C" {
 }
 #include "../common/common_enum.h"
 
+using icu::Locale;
+
 U_CFUNC PHP_METHOD(IntlCalendar, __construct)
 {
 	zend_throw_exception( NULL,
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/gregoriancalendar_methods.cpp php-7.0.33/ext/intl/calendar/gregoriancalendar_methods.cpp
--- php-7.0.33.org/ext/intl/calendar/gregoriancalendar_methods.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/calendar/gregoriancalendar_methods.cpp	2021-08-23 23:37:07.402418347 +0200
@@ -34,6 +34,11 @@ extern "C" {
 #include "zend_exceptions.h"
 }
 
+using icu::GregorianCalendar;
+using icu::Locale;
+using icu::UnicodeString;
+using icu::StringPiece;
+
 static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
 	return (GregorianCalendar*)co->ucal;
 }
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_date.cpp php-7.0.33/ext/intl/common/common_date.cpp
--- php-7.0.33.org/ext/intl/common/common_date.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/common/common_date.cpp	2021-08-23 23:37:07.402418347 +0200
@@ -17,6 +17,8 @@
 #include "../intl_cppshims.h"
 
 #include <unicode/calendar.h>
+using icu::TimeZone;
+using icu::UnicodeString;
 
 extern "C" {
 #include "../php_intl.h"
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_date.h php-7.0.33/ext/intl/common/common_date.h
--- php-7.0.33.org/ext/intl/common/common_date.h	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/common/common_date.h	2021-08-23 23:37:07.402418347 +0200
@@ -27,6 +27,7 @@ U_CDECL_END
 #ifdef __cplusplus
 
 #include <unicode/timezone.h>
+using icu::TimeZone;
 
 U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func);
 U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_enum.h php-7.0.33/ext/intl/common/common_enum.h
--- php-7.0.33.org/ext/intl/common/common_enum.h	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/common/common_enum.h	2021-08-23 23:37:07.402418347 +0200
@@ -75,6 +75,7 @@ U_CFUNC zval *zoi_with_current_get_curre
 U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
 
 #ifdef __cplusplus
+using icu::StringEnumeration;
 U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
 #endif
 
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_format_object.cpp php-7.0.33/ext/intl/dateformat/dateformat_format_object.cpp
--- php-7.0.33.org/ext/intl/dateformat/dateformat_format_object.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/dateformat/dateformat_format_object.cpp	2021-08-23 23:37:07.402418347 +0200
@@ -33,6 +33,12 @@ extern "C" {
 #include "../common/common_date.h"
 }
 
+using icu::Locale;
+using icu::DateFormat;
+using icu::GregorianCalendar;
+using icu::StringPiece;
+using icu::SimpleDateFormat;
+
 static const DateFormat::EStyle valid_styles[] = {
 		DateFormat::kNone,
 		DateFormat::kFull,
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.cpp php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp
--- php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp	2021-08-23 23:37:07.402418347 +0200
@@ -28,6 +28,8 @@ extern "C" {
 #include "../calendar/calendar_class.h"
 }
 
+using icu::GregorianCalendar;
+
 int datefmt_process_calendar_arg(zval* calendar_zv,
 								 Locale const& locale,
 								 const char *func_name,
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.h php-7.0.33/ext/intl/dateformat/dateformat_helpers.h
--- php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.h	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.h	2021-08-23 23:37:07.402418347 +0200
@@ -23,10 +23,17 @@
 
 #include <unicode/calendar.h>
 
+#include <unicode/datefmt.h>
+
 extern "C" {
 #include "../php_intl.h"
 }
 
+using icu::Locale;
+using icu::Calendar;
+
+using icu::DateFormat;
+
 int datefmt_process_calendar_arg(zval* calendar_zv,
 								 Locale const& locale,
 								 const char *func_name,
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/intl_convertcpp.h php-7.0.33/ext/intl/intl_convertcpp.h
--- php-7.0.33.org/ext/intl/intl_convertcpp.h	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/intl_convertcpp.h	2021-08-23 23:37:07.402418347 +0200
@@ -25,6 +25,7 @@
 
 #include <unicode/unistr.h>
 #include <zend_types.h>
+using icu::UnicodeString;
 
 int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status);
 
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/msgformat/msgformat_helpers.cpp php-7.0.33/ext/intl/msgformat/msgformat_helpers.cpp
--- php-7.0.33.org/ext/intl/msgformat/msgformat_helpers.cpp	2018-12-04 18:22:54.000000000 +0100
+++ php-7.0.33/ext/intl/msgformat/msgformat_helpers.cpp	2021-08-23 23:37:07.402418347 +0200
@@ -27,6 +27,7 @@
 #include <unicode/timezone.h>
 #include <unicode/datefmt.h>
 #include <unicode/calendar.h>
+#include <unicode/strenum.h>
 
 #include <vector>
 
@@ -76,6 +77,16 @@ MessageFormatAdapter::getMessagePattern(
 #endif
 U_NAMESPACE_END
 
+using icu::Formattable;
+using icu::Format;
+using icu::DateFormat;
+using icu::MessageFormat;
+#ifdef HAS_MESSAGE_PATTERN
+using icu::MessagePattern;
+#endif
+using icu::MessageFormatAdapter;
+using icu::FieldPosition;
+
 U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
 {
 	int32_t fmt_count = 0;
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_class.cpp php-7.0.33/ext/intl/timezone/timezone_class.cpp
--- php-7.0.33.org/ext/intl/timezone/timezone_class.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/timezone/timezone_class.cpp	2021-08-23 23:37:07.402418347 +0200
@@ -37,6 +37,8 @@ extern "C" {
 #include <ext/date/php_date.h>
 }
 
+using icu::Calendar;
+
 /* {{{ Global variables */
 U_CDECL_BEGIN
 zend_class_entry *TimeZone_ce_ptr = NULL;
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_class.h php-7.0.33/ext/intl/timezone/timezone_class.h
--- php-7.0.33.org/ext/intl/timezone/timezone_class.h	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/timezone/timezone_class.h	2021-08-23 23:37:07.402418347 +0200
@@ -29,6 +29,8 @@
 
 #ifndef USE_TIMEZONE_POINTER
 typedef void TimeZone;
+#else
+using icu::TimeZone;
 #endif
 
 typedef struct {
diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_methods.cpp php-7.0.33/ext/intl/timezone/timezone_methods.cpp
--- php-7.0.33.org/ext/intl/timezone/timezone_methods.cpp	2018-12-04 18:22:53.000000000 +0100
+++ php-7.0.33/ext/intl/timezone/timezone_methods.cpp	2021-08-23 23:37:07.402418347 +0200
@@ -23,6 +23,7 @@
 #include <unicode/locid.h>
 #include <unicode/timezone.h>
 #include <unicode/ustring.h>
+#include <unicode/calendar.h>
 #include "intl_convertcpp.h"
 
 #include "../common/common_date.h"
@@ -37,6 +38,9 @@ extern "C" {
 }
 #include "common/common_enum.h"
 
+using icu::Locale;
+using icu::Calendar;
+
 U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
 {
 	zend_throw_exception( NULL,
Commit	Line	Data
59609f89 JR	1	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.cpp php-7.0.33/ext/intl/breakiterator/breakiterator_class.cpp
	2	--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.cpp 2018-12-04 18:22:53.000000000 +0100
	3	+++ php-7.0.33/ext/intl/breakiterator/breakiterator_class.cpp 2021-08-23 23:37:07.399084984 +0200
	4	@@ -38,6 +38,7 @@ extern "C" {
87d63f96 AG	5	}
	6
	7	using PHP::CodePointBreakIterator;
	8	+using icu::RuleBasedBreakIterator;
	9
	10	/* {{{ Global variables */
	11	zend_class_entry *BreakIterator_ce_ptr;
59609f89 JR	12	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.h php-7.0.33/ext/intl/breakiterator/breakiterator_class.h
	13	--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.h 2018-12-04 18:22:53.000000000 +0100
	14	+++ php-7.0.33/ext/intl/breakiterator/breakiterator_class.h 2021-08-23 23:37:07.399084984 +0200
87d63f96 AG	15	@@ -26,6 +26,8 @@
	16
	17	#ifndef USE_BREAKITERATOR_POINTER
	18	typedef void BreakIterator;
	19	+#else
	20	+using icu::BreakIterator;
	21	#endif
	22
	23	typedef struct {
59609f89 JR	24	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_methods.cpp php-7.0.33/ext/intl/breakiterator/breakiterator_methods.cpp
	25	--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_methods.cpp 2018-12-04 18:22:53.000000000 +0100
	26	+++ php-7.0.33/ext/intl/breakiterator/breakiterator_methods.cpp 2021-08-23 23:37:07.399084984 +0200
	27	@@ -32,6 +32,8 @@ extern "C" {
87d63f96 AG	28	}
	29
	30	using PHP::CodePointBreakIterator;
	31	+using icu::BreakIterator;
	32	+using icu::Locale;
	33
	34	U_CFUNC PHP_METHOD(BreakIterator, __construct)
	35	{
59609f89 JR	36	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.cpp php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.cpp
	37	--- php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.cpp 2018-12-04 18:22:53.000000000 +0100
	38	+++ php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.cpp 2021-08-23 23:37:07.399084984 +0200
	39	@@ -32,6 +32,7 @@ typedef union {
87d63f96 AG	40	#define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr))
	41
	42	using namespace PHP;
	43	+using icu::UCharCharacterIterator;
	44
	45	UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
	46
59609f89 JR	47	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.h php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.h
	48	--- php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.h 2018-12-04 18:22:53.000000000 +0100
	49	+++ php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.h 2021-08-23 23:37:07.399084984 +0200
87d63f96 AG	50	@@ -18,8 +18,11 @@
	51	#define CODEPOINTITERATOR_INTERNAL_H
	52
	53	#include <unicode/brkiter.h>
	54	+#include <unicode/unistr.h>
	55
	56	-using U_ICU_NAMESPACE::BreakIterator;
	57	+using icu::BreakIterator;
	58	+using icu::CharacterIterator;
	59	+using icu::UnicodeString;
	60
	61	namespace PHP {
	62
59609f89 JR	63	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp php-7.0.33/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
	64	--- php-7.0.33.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp 2018-12-04 18:22:53.000000000 +0100
	65	+++ php-7.0.33/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp 2021-08-23 23:37:07.399084984 +0200
	66	@@ -26,6 +26,9 @@ extern "C" {
	67	#include "../intl_convertcpp.h"
	68	#include "../intl_common.h"
87d63f96 AG	69
	70	+using icu::RuleBasedBreakIterator;
	71	+using icu::Locale;
	72	+
	73	static inline RuleBasedBreakIterator fetch_rbbi(BreakIterator_object bio) {
	74	return (RuleBasedBreakIterator*)bio->biter;
	75	}
59609f89 JR	76	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_class.cpp php-7.0.33/ext/intl/calendar/calendar_class.cpp
	77	--- php-7.0.33.org/ext/intl/calendar/calendar_class.cpp 2018-12-04 18:22:53.000000000 +0100
	78	+++ php-7.0.33/ext/intl/calendar/calendar_class.cpp 2021-08-23 23:37:07.399084984 +0200
	79	@@ -34,6 +34,9 @@ extern "C" {
87d63f96 AG	80	#include <assert.h>
	81	}
	82
	83	+using icu::GregorianCalendar;
	84	+using icu::Locale;
	85	+
	86	/* {{{ Global variables */
	87	zend_class_entry *Calendar_ce_ptr;
	88	zend_class_entry *GregorianCalendar_ce_ptr;
59609f89 JR	89	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_class.h php-7.0.33/ext/intl/calendar/calendar_class.h
	90	--- php-7.0.33.org/ext/intl/calendar/calendar_class.h 2018-12-04 18:22:53.000000000 +0100
	91	+++ php-7.0.33/ext/intl/calendar/calendar_class.h 2021-08-23 23:37:07.399084984 +0200
87d63f96 AG	92	@@ -26,6 +26,8 @@
	93
	94	#ifndef USE_CALENDAR_POINTER
	95	typedef void Calendar;
	96	+#else
	97	+using icu::Calendar;
	98	#endif
	99
	100	typedef struct {
59609f89 JR	101	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_methods.cpp php-7.0.33/ext/intl/calendar/calendar_methods.cpp
	102	--- php-7.0.33.org/ext/intl/calendar/calendar_methods.cpp 2018-12-04 18:22:53.000000000 +0100
	103	+++ php-7.0.33/ext/intl/calendar/calendar_methods.cpp 2021-08-23 23:37:07.402418347 +0200
	104	@@ -40,6 +40,8 @@ extern "C" {
87d63f96 AG	105	}
	106	#include "../common/common_enum.h"
	107
	108	+using icu::Locale;
	109	+
	110	U_CFUNC PHP_METHOD(IntlCalendar, __construct)
	111	{
	112	zend_throw_exception( NULL,
59609f89 JR	113	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/gregoriancalendar_methods.cpp php-7.0.33/ext/intl/calendar/gregoriancalendar_methods.cpp
	114	--- php-7.0.33.org/ext/intl/calendar/gregoriancalendar_methods.cpp 2018-12-04 18:22:53.000000000 +0100
	115	+++ php-7.0.33/ext/intl/calendar/gregoriancalendar_methods.cpp 2021-08-23 23:37:07.402418347 +0200
	116	@@ -34,6 +34,11 @@ extern "C" {
	117	#include "zend_exceptions.h"
87d63f96 AG	118	}
	119
	120	+using icu::GregorianCalendar;
	121	+using icu::Locale;
	122	+using icu::UnicodeString;
	123	+using icu::StringPiece;
	124	+
	125	static inline GregorianCalendar fetch_greg(Calendar_object co) {
	126	return (GregorianCalendar*)co->ucal;
	127	}
59609f89 JR	128	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_date.cpp php-7.0.33/ext/intl/common/common_date.cpp
	129	--- php-7.0.33.org/ext/intl/common/common_date.cpp 2018-12-04 18:22:53.000000000 +0100
	130	+++ php-7.0.33/ext/intl/common/common_date.cpp 2021-08-23 23:37:07.402418347 +0200
87d63f96	131	@@ -17,6 +17,8 @@
59609f89	132	#include "../intl_cppshims.h"
87d63f96 AG	133
	134	#include <unicode/calendar.h>
	135	+using icu::TimeZone;
	136	+using icu::UnicodeString;
	137
	138	extern "C" {
	139	#include "../php_intl.h"
59609f89 JR	140	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_date.h php-7.0.33/ext/intl/common/common_date.h
	141	--- php-7.0.33.org/ext/intl/common/common_date.h 2018-12-04 18:22:53.000000000 +0100
	142	+++ php-7.0.33/ext/intl/common/common_date.h 2021-08-23 23:37:07.402418347 +0200
	143	@@ -27,6 +27,7 @@ U_CDECL_END
87d63f96 AG	144	#ifdef __cplusplus
	145
	146	#include <unicode/timezone.h>
	147	+using icu::TimeZone;
	148
59609f89	149	U_CFUNC TimeZone timezone_convert_datetimezone(int type, void object, int is_datetime, intl_error outside_error, const char func);
87d63f96	150	U_CFUNC int intl_datetime_decompose(zval z, double millis, TimeZone **tz,
59609f89 JR	151	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_enum.h php-7.0.33/ext/intl/common/common_enum.h
	152	--- php-7.0.33.org/ext/intl/common/common_enum.h 2018-12-04 18:22:53.000000000 +0100
	153	+++ php-7.0.33/ext/intl/common/common_enum.h 2021-08-23 23:37:07.402418347 +0200
	154	@@ -75,6 +75,7 @@ U_CFUNC zval *zoi_with_current_get_curre
87d63f96 AG	155	U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
	156
	157	#ifdef __cplusplus
	158	+using icu::StringEnumeration;
	159	U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration se, zval object);
	160	#endif
	161
59609f89 JR	162	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_format_object.cpp php-7.0.33/ext/intl/dateformat/dateformat_format_object.cpp
	163	--- php-7.0.33.org/ext/intl/dateformat/dateformat_format_object.cpp 2018-12-04 18:22:53.000000000 +0100
	164	+++ php-7.0.33/ext/intl/dateformat/dateformat_format_object.cpp 2021-08-23 23:37:07.402418347 +0200
	165	@@ -33,6 +33,12 @@ extern "C" {
87d63f96 AG	166	#include "../common/common_date.h"
	167	}
	168
	169	+using icu::Locale;
	170	+using icu::DateFormat;
	171	+using icu::GregorianCalendar;
	172	+using icu::StringPiece;
	173	+using icu::SimpleDateFormat;
	174	+
	175	static const DateFormat::EStyle valid_styles[] = {
	176	DateFormat::kNone,
	177	DateFormat::kFull,
59609f89 JR	178	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.cpp php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp
	179	--- php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.cpp 2018-12-04 18:22:53.000000000 +0100
	180	+++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp 2021-08-23 23:37:07.402418347 +0200
	181	@@ -28,6 +28,8 @@ extern "C" {
	182	#include "../calendar/calendar_class.h"
	183	}
87d63f96	184
59609f89	185	+using icu::GregorianCalendar;
64d6d11b	186	+
59609f89 JR	187	int datefmt_process_calendar_arg(zval* calendar_zv,
	188	Locale const& locale,
	189	const char *func_name,
	190	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.h php-7.0.33/ext/intl/dateformat/dateformat_helpers.h
	191	--- php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.h 2018-12-04 18:22:53.000000000 +0100
	192	+++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.h 2021-08-23 23:37:07.402418347 +0200
	193	@@ -23,10 +23,17 @@
87d63f96	194
59609f89 JR	195	#include <unicode/calendar.h>
	196
	197	+#include <unicode/datefmt.h>
	198	+
87d63f96 AG	199	extern "C" {
	200	#include "../php_intl.h"
	201	}
	202
	203	+using icu::Locale;
	204	+using icu::Calendar;
64d6d11b	205	+
87d63f96 AG	206	+using icu::DateFormat;
	207	+
	208	int datefmt_process_calendar_arg(zval* calendar_zv,
	209	Locale const& locale,
	210	const char *func_name,
59609f89 JR	211	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/intl_convertcpp.h php-7.0.33/ext/intl/intl_convertcpp.h
	212	--- php-7.0.33.org/ext/intl/intl_convertcpp.h 2018-12-04 18:22:53.000000000 +0100
	213	+++ php-7.0.33/ext/intl/intl_convertcpp.h 2021-08-23 23:37:07.402418347 +0200
	214	@@ -25,6 +25,7 @@
87d63f96 AG	215
	216	#include <unicode/unistr.h>
	217	#include <zend_types.h>
	218	+using icu::UnicodeString;
	219
59609f89	220	int intl_stringFromChar(UnicodeString &ret, char str, size_t str_len, UErrorCode status);
87d63f96	221
59609f89 JR	222	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/msgformat/msgformat_helpers.cpp php-7.0.33/ext/intl/msgformat/msgformat_helpers.cpp
	223	--- php-7.0.33.org/ext/intl/msgformat/msgformat_helpers.cpp 2018-12-04 18:22:54.000000000 +0100
	224	+++ php-7.0.33/ext/intl/msgformat/msgformat_helpers.cpp 2021-08-23 23:37:07.402418347 +0200
87d63f96 AG	225	@@ -27,6 +27,7 @@
	226	#include <unicode/timezone.h>
	227	#include <unicode/datefmt.h>
	228	#include <unicode/calendar.h>
	229	+#include <unicode/strenum.h>
	230
	231	#include <vector>
	232
59609f89	233	@@ -76,6 +77,16 @@ MessageFormatAdapter::getMessagePattern(
87d63f96 AG	234	#endif
	235	U_NAMESPACE_END
	236
	237	+using icu::Formattable;
	238	+using icu::Format;
	239	+using icu::DateFormat;
	240	+using icu::MessageFormat;
	241	+#ifdef HAS_MESSAGE_PATTERN
	242	+using icu::MessagePattern;
	243	+#endif
	244	+using icu::MessageFormatAdapter;
	245	+using icu::FieldPosition;
	246	+
	247	U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
	248	{
	249	int32_t fmt_count = 0;
59609f89 JR	250	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_class.cpp php-7.0.33/ext/intl/timezone/timezone_class.cpp
	251	--- php-7.0.33.org/ext/intl/timezone/timezone_class.cpp 2018-12-04 18:22:53.000000000 +0100
	252	+++ php-7.0.33/ext/intl/timezone/timezone_class.cpp 2021-08-23 23:37:07.402418347 +0200
	253	@@ -37,6 +37,8 @@ extern "C" {
87d63f96 AG	254	#include <ext/date/php_date.h>
	255	}
	256
	257	+using icu::Calendar;
	258	+
	259	/* {{{ Global variables */
	260	U_CDECL_BEGIN
	261	zend_class_entry *TimeZone_ce_ptr = NULL;
59609f89 JR	262	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_class.h php-7.0.33/ext/intl/timezone/timezone_class.h
	263	--- php-7.0.33.org/ext/intl/timezone/timezone_class.h 2018-12-04 18:22:53.000000000 +0100
	264	+++ php-7.0.33/ext/intl/timezone/timezone_class.h 2021-08-23 23:37:07.402418347 +0200
87d63f96 AG	265	@@ -29,6 +29,8 @@
	266
	267	#ifndef USE_TIMEZONE_POINTER
	268	typedef void TimeZone;
	269	+#else
	270	+using icu::TimeZone;
	271	#endif
	272
	273	typedef struct {
59609f89 JR	274	diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_methods.cpp php-7.0.33/ext/intl/timezone/timezone_methods.cpp
	275	--- php-7.0.33.org/ext/intl/timezone/timezone_methods.cpp 2018-12-04 18:22:53.000000000 +0100
	276	+++ php-7.0.33/ext/intl/timezone/timezone_methods.cpp 2021-08-23 23:37:07.402418347 +0200
87d63f96 AG	277	@@ -23,6 +23,7 @@
	278	#include <unicode/locid.h>
	279	#include <unicode/timezone.h>
	280	#include <unicode/ustring.h>
	281	+#include <unicode/calendar.h>
	282	#include "intl_convertcpp.h"
	283
	284	#include "../common/common_date.h"
59609f89	285	@@ -37,6 +38,9 @@ extern "C" {
87d63f96 AG	286	}
	287	#include "common/common_enum.h"
	288
	289	+using icu::Locale;
	290	+using icu::Calendar;
	291	+
	292	U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
	293	{
	294	zend_throw_exception( NULL,