Simplify namespace access

The icu namespace is an alias which resolves to the real namespace.

diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp
index 5d42e671b5781f6aed520d5eda5ba061d559e9d5..51433bf43f7cee4af6f0bdfbb3c50a20155ba50c 100644 (file)
--- a/ext/intl/breakiterator/breakiterator_class.cpp
+++ b/ext/intl/breakiterator/breakiterator_class.cpp
@@ -38,7 +38,7 @@ extern "C" {
 }
 
 using PHP::CodePointBreakIterator;
-using U_ICU_NAMESPACE::RuleBasedBreakIterator;
+using icu::RuleBasedBreakIterator;
 
 /* {{{ Global variables */
 zend_class_entry *BreakIterator_ce_ptr;

diff --git a/ext/intl/breakiterator/breakiterator_class.h b/ext/intl/breakiterator/breakiterator_class.h
index 9032f6f90f41ff3454789dae537983050d8d41f3..a856b7c7e0724b10f79d783a17a568af2d9b1105 100644 (file)
--- a/ext/intl/breakiterator/breakiterator_class.h
+++ b/ext/intl/breakiterator/breakiterator_class.h
@@ -27,7 +27,7 @@
 #ifndef USE_BREAKITERATOR_POINTER
 typedef void BreakIterator;
 #else
-using U_ICU_NAMESPACE::BreakIterator;
+using icu::BreakIterator;
 #endif
 
 typedef struct {

diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp
index 1a9195446966a79e9ff344659c77e65ca5d2a6c9..f5ddc9c62fa423de9b623c5e621fa4bb1ebdc7c7 100644 (file)
--- a/ext/intl/breakiterator/breakiterator_methods.cpp
+++ b/ext/intl/breakiterator/breakiterator_methods.cpp
@@ -32,8 +32,8 @@ extern "C" {
 }
 
 using PHP::CodePointBreakIterator;
-using U_ICU_NAMESPACE::BreakIterator;
-using U_ICU_NAMESPACE::Locale;
+using icu::BreakIterator;
+using icu::Locale;
 
 U_CFUNC PHP_METHOD(BreakIterator, __construct)
 {

diff --git a/ext/intl/breakiterator/codepointiterator_internal.cpp b/ext/intl/breakiterator/codepointiterator_internal.cpp
index 1b6339cd6e9ef5502bdb5cab9cd8f3ad80801626..8994646bd12078febfd5123398fa22f5268641a0 100644 (file)
--- a/ext/intl/breakiterator/codepointiterator_internal.cpp
+++ b/ext/intl/breakiterator/codepointiterator_internal.cpp
@@ -33,7 +33,7 @@ typedef union {
 
 using namespace PHP;
 
-using U_ICU_NAMESPACE::UCharCharacterIterator;
+using icu::UCharCharacterIterator;
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
 

diff --git a/ext/intl/breakiterator/codepointiterator_internal.h b/ext/intl/breakiterator/codepointiterator_internal.h
index d8633516d8a7be93dde8af193d8cb5ea54d6079a..7ecf12deb5ae31aa7cab989fedfda31c57b70a65 100644 (file)
--- a/ext/intl/breakiterator/codepointiterator_internal.h
+++ b/ext/intl/breakiterator/codepointiterator_internal.h
@@ -20,9 +20,9 @@
 #include <unicode/brkiter.h>
 #include <unicode/unistr.h>
 
-using U_ICU_NAMESPACE::BreakIterator;
-using U_ICU_NAMESPACE::CharacterIterator;
-using U_ICU_NAMESPACE::UnicodeString;
+using icu::BreakIterator;
+using icu::CharacterIterator;
+using icu::UnicodeString;
 
 namespace PHP {
 

diff --git a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
index b0fe87eda5e39ded9b6d0d4dce65b950eb3142c2..90c7ad7f0258d80c1dd9970664964ddaefc7e2c5 100644 (file)
--- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
+++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
@@ -26,8 +26,8 @@ extern "C" {
 #include "../intl_convertcpp.h"
 #include "../intl_common.h"
 
-using U_ICU_NAMESPACE::RuleBasedBreakIterator;
-using U_ICU_NAMESPACE::Locale;
+using icu::RuleBasedBreakIterator;
+using icu::Locale;
 
 static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
        return (RuleBasedBreakIterator*)bio->biter;

diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp
index 4a641d967cb0b34070cfd2a086b3f61e952811d6..a3844d326635aab216e9a446e7a84163fcb3405d 100644 (file)
--- a/ext/intl/calendar/calendar_class.cpp
+++ b/ext/intl/calendar/calendar_class.cpp
@@ -34,8 +34,8 @@ extern "C" {
 #include <assert.h>
 }
 
-using U_ICU_NAMESPACE::GregorianCalendar;
-using U_ICU_NAMESPACE::Locale;
+using icu::GregorianCalendar;
+using icu::Locale;
 
 /* {{{ Global variables */
 zend_class_entry *Calendar_ce_ptr;

diff --git a/ext/intl/calendar/calendar_class.h b/ext/intl/calendar/calendar_class.h
index 3202f672a53a7f953e76a17924d9b11366b8f7e3..33cd7bc8e39fde7f7c420a856d2cf5125609f844 100644 (file)
--- a/ext/intl/calendar/calendar_class.h
+++ b/ext/intl/calendar/calendar_class.h
@@ -27,7 +27,7 @@
 #ifndef USE_CALENDAR_POINTER
 typedef void Calendar;
 #else
-using U_ICU_NAMESPACE::Calendar;
+using icu::Calendar;
 #endif
 
 typedef struct {

diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp
index 0f450c737dea34dac03a60c6d0528e66f629fa68..8c6aaed1036433bbd3d2616076337316a3a8318d 100644 (file)
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -43,7 +43,7 @@ extern "C" {
 }
 #include "../common/common_enum.h"
 
-using U_ICU_NAMESPACE::Locale;
+using icu::Locale;
 
 U_CFUNC PHP_METHOD(IntlCalendar, __construct)
 {

diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp
index 33f0cb0c8e166a50e8d9d3e6ade29c8702d2f2ef..48745818b5f37df8305c8e11f5fde52e37d6f4ac 100644 (file)
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -36,10 +36,10 @@ extern "C" {
 #include "zend_exceptions.h"
 }
 
-using U_ICU_NAMESPACE::GregorianCalendar;
-using U_ICU_NAMESPACE::Locale;
-using U_ICU_NAMESPACE::UnicodeString;
-using U_ICU_NAMESPACE::StringPiece;
+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 --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp
index 2e8e296472e88c63404d671bb542ec41c4c2f12e..ea881d9dfa774414ca745608045272ad31a289f1 100644 (file)
--- 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 5ed02002328074b6fe9132ca9ca60ed49e16b08f..a1c08e434eb715d15755a0266eb9edc383dd281f 100644 (file)
--- 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 41c102a5b1618b789692cb9cf76ba79ed5d2eba7..9e47115304172069a22af764b2d0532940ebe821 100644 (file)
--- 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
 

diff --git a/ext/intl/dateformat/dateformat_format_object.cpp b/ext/intl/dateformat/dateformat_format_object.cpp
index d0010fc856c91cc31d9cf7ea8c9eff35b9baee4a..7a3979a043f1f70b9f0372222e8ad5fdaec48fad 100644 (file)
--- a/ext/intl/dateformat/dateformat_format_object.cpp
+++ b/ext/intl/dateformat/dateformat_format_object.cpp
@@ -33,11 +33,11 @@ extern "C" {
 #include "../common/common_date.h"
 }
 
-using U_ICU_NAMESPACE::Locale;
-using U_ICU_NAMESPACE::DateFormat;
-using U_ICU_NAMESPACE::GregorianCalendar;
-using U_ICU_NAMESPACE::StringPiece;
-using U_ICU_NAMESPACE::SimpleDateFormat;
+using icu::Locale;
+using icu::DateFormat;
+using icu::GregorianCalendar;
+using icu::StringPiece;
+using icu::SimpleDateFormat;
 
 static const DateFormat::EStyle valid_styles[] = {
                DateFormat::kNone,

diff --git a/ext/intl/dateformat/dateformat_helpers.cpp b/ext/intl/dateformat/dateformat_helpers.cpp
index 3caf59a3091349c4831047f2063ed3920756f1d6..7e070ea464ad7fce4527576387bc9855b59d7bd1 100644 (file)
--- a/ext/intl/dateformat/dateformat_helpers.cpp
+++ b/ext/intl/dateformat/dateformat_helpers.cpp
@@ -28,7 +28,7 @@ extern "C" {
 #include "../calendar/calendar_class.h"
 }
 
-using U_ICU_NAMESPACE::GregorianCalendar;
+using icu::GregorianCalendar;
 
 int datefmt_process_calendar_arg(zval* calendar_zv,
                                                                 Locale const& locale,

diff --git a/ext/intl/dateformat/dateformat_helpers.h b/ext/intl/dateformat/dateformat_helpers.h
index 162c35abfb9b03a731c78fb5c3a55f24ceaabe36..fd73e81d89c0fe68b305e4079e7091af11067ae6 100644 (file)
--- a/ext/intl/dateformat/dateformat_helpers.h
+++ b/ext/intl/dateformat/dateformat_helpers.h
@@ -28,9 +28,9 @@ extern "C" {
 #include "../php_intl.h"
 }
 
-using U_ICU_NAMESPACE::Locale;
-using U_ICU_NAMESPACE::Calendar;
-using U_ICU_NAMESPACE::DateFormat;
+using icu::Locale;
+using icu::Calendar;
+using icu::DateFormat;
 
 int datefmt_process_calendar_arg(zval* calendar_zv,
                                                                 Locale const& locale,

diff --git a/ext/intl/intl_convertcpp.h b/ext/intl/intl_convertcpp.h
index e3c53d7a5693ff4ea082c00af18b268584a088ee..0bb486f7b658c6bac77e3061a6406af57f38b625 100644 (file)
--- a/ext/intl/intl_convertcpp.h
+++ b/ext/intl/intl_convertcpp.h
@@ -26,7 +26,7 @@
 #include <unicode/unistr.h>
 #include <zend_types.h>
 
-using U_ICU_NAMESPACE::UnicodeString;
+using icu::UnicodeString;
 
 int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status);
 

diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp
index 5a45398dcefb186d32e95c5e755b1444bdd50e53..287139bb9338ddf8011cad279ac444f1ba211594 100644 (file)
--- a/ext/intl/msgformat/msgformat_helpers.cpp
+++ b/ext/intl/msgformat/msgformat_helpers.cpp
@@ -76,15 +76,15 @@ MessageFormatAdapter::getMessagePattern(MessageFormat* m) {
 #endif
 U_NAMESPACE_END
 
-using U_ICU_NAMESPACE::Formattable;
-using U_ICU_NAMESPACE::Format;
-using U_ICU_NAMESPACE::DateFormat;
-using U_ICU_NAMESPACE::MessageFormat;
+using icu::Formattable;
+using icu::Format;
+using icu::DateFormat;
+using icu::MessageFormat;
 #ifdef HAS_MESSAGE_PATTERN
-using U_ICU_NAMESPACE::MessagePattern;
+using icu::MessagePattern;
 #endif
-using U_ICU_NAMESPACE::MessageFormatAdapter;
-using U_ICU_NAMESPACE::FieldPosition;
+using icu::MessageFormatAdapter;
+using icu::FieldPosition;
 
 U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
 {

diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp
index d3038504f6eb88a5c5dbad4df3ea5c931896884a..70d2067a1ce9e73f27cd7ce5657cdce88d482dad 100644 (file)
--- a/ext/intl/timezone/timezone_class.cpp
+++ b/ext/intl/timezone/timezone_class.cpp
@@ -37,7 +37,7 @@ extern "C" {
 #include <ext/date/php_date.h>
 }
 
-using U_ICU_NAMESPACE::Calendar;
+using icu::Calendar;
 
 /* {{{ Global variables */
 U_CDECL_BEGIN

diff --git a/ext/intl/timezone/timezone_class.h b/ext/intl/timezone/timezone_class.h
index d6c45a46f1dd66a3e152bd8953c58c30b0091a8d..99e9b56dae044af5beefd4ced22a107a1aaf7cfe 100644 (file)
--- a/ext/intl/timezone/timezone_class.h
+++ b/ext/intl/timezone/timezone_class.h
@@ -30,7 +30,7 @@
 #ifndef USE_TIMEZONE_POINTER
 typedef void TimeZone;
 #else
-using U_ICU_NAMESPACE::TimeZone;
+using icu::TimeZone;
 #endif
 
 typedef struct {

diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index abf4548d27aa19b16faf9622395956c516769deb..5cf5afc934bce88233820ad17626fb01295b48a2 100644 (file)
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -38,8 +38,8 @@ extern "C" {
 }
 #include "common/common_enum.h"
 
-using U_ICU_NAMESPACE::Locale;
-using U_ICU_NAMESPACE::Calendar;
+using icu::Locale;
+using icu::Calendar;
 
 U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
 {