Simplify namespace access

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

4 files changed, 8 insertions, 8 deletions

diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp
index 4a641d967c..a3844d3266 100644
--- 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 3202f672a5..33cd7bc8e3 100644
--- 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 0f450c737d..8c6aaed103 100644
--- 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 33f0cb0c8e..48745818b5 100644
--- 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;