diff options
author | Anatol Belski <ab@php.net> | 2018-03-31 18:51:03 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2018-03-31 18:51:56 +0200 |
commit | 8d35a423838eb462cd39ee535c5d003073cc5f22 (patch) | |
tree | baf326dd800f1521f62bcbc5b1b1106cc0c9e76b /ext/intl/common | |
parent | cad2a0f9c3f07b79269c49db491d7855ac13b4d2 (diff) | |
download | php-git-8d35a423838eb462cd39ee535c5d003073cc5f22.tar.gz |
Utilize the recommended way to handle the icu namespace
Diffstat (limited to 'ext/intl/common')
-rw-r--r-- | ext/intl/common/common_date.cpp | 3 | ||||
-rw-r--r-- | ext/intl/common/common_date.h | 2 | ||||
-rw-r--r-- | ext/intl/common/common_enum.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp index bd2baee776..2e8e296472 100644 --- a/ext/intl/common/common_date.cpp +++ b/ext/intl/common/common_date.cpp @@ -25,6 +25,9 @@ extern "C" { #include <ext/date/php_date.h> } +using U_ICU_NAMESPACE::TimeZone; +using U_ICU_NAMESPACE::UnicodeString; + #include "zend_portability.h" /* {{{ timezone_convert_datetimezone diff --git a/ext/intl/common/common_date.h b/ext/intl/common/common_date.h index d6b7c20719..5ed0200232 100644 --- a/ext/intl/common/common_date.h +++ b/ext/intl/common/common_date.h @@ -28,6 +28,8 @@ U_CDECL_END #include <unicode/timezone.h> +using U_ICU_NAMESPACE::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, intl_error *err, const char *func); diff --git a/ext/intl/common/common_enum.h b/ext/intl/common/common_enum.h index b9b87c17e0..41c102a5b1 100644 --- a/ext/intl/common/common_enum.h +++ b/ext/intl/common/common_enum.h @@ -75,6 +75,7 @@ U_CFUNC zval *zoi_with_current_get_current_data(zend_object_iterator *iter); U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter); #ifdef __cplusplus +using U_ICU_NAMESPACE::StringEnumeration; U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object); #endif |