summaryrefslogtreecommitdiff
path: root/ext/intl/common
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-04-01 01:03:40 +0200
committerAnatol Belski <ab@php.net>2018-04-01 01:03:40 +0200
commitd8200e48857aeaf09f7127751efc5632ef7660a7 (patch)
tree0e920dce471d43ddd4803b24535f27a1da9150b1 /ext/intl/common
parent8d35a423838eb462cd39ee535c5d003073cc5f22 (diff)
downloadphp-git-d8200e48857aeaf09f7127751efc5632ef7660a7.tar.gz
Simplify namespace access
The icu namespace is an alias which resolves to the real namespace.
Diffstat (limited to 'ext/intl/common')
-rw-r--r--ext/intl/common/common_date.cpp4
-rw-r--r--ext/intl/common/common_date.h2
-rw-r--r--ext/intl/common/common_enum.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp
index 2e8e296472..ea881d9dfa 100644
--- a/ext/intl/common/common_date.cpp
+++ b/ext/intl/common/common_date.cpp
@@ -25,8 +25,8 @@ extern "C" {
#include <ext/date/php_date.h>
}
-using U_ICU_NAMESPACE::TimeZone;
-using U_ICU_NAMESPACE::UnicodeString;
+using icu::TimeZone;
+using icu::UnicodeString;
#include "zend_portability.h"
diff --git a/ext/intl/common/common_date.h b/ext/intl/common/common_date.h
index 5ed0200232..a1c08e434e 100644
--- a/ext/intl/common/common_date.h
+++ b/ext/intl/common/common_date.h
@@ -28,7 +28,7 @@ U_CDECL_END
#include <unicode/timezone.h>
-using U_ICU_NAMESPACE::TimeZone;
+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 --git a/ext/intl/common/common_enum.h b/ext/intl/common/common_enum.h
index 41c102a5b1..9e47115304 100644
--- a/ext/intl/common/common_enum.h
+++ b/ext/intl/common/common_enum.h
@@ -75,7 +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;
+using icu::StringEnumeration;
U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
#endif