LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
10190 Commits
1 Branch
46 MiB
Tree: a70227e578
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'a70227e578'
${ noResults }
openwrt-packages-dist/lang/php7/patches/1101-Simplify-namespace-acc...

307 lines
9.4 KiB
Raw Normal View History

php7: fix compile issue with icu 61.1 (refs #5853) Compile tested only at the moment. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
7 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. From d8200e48857aeaf09f7127751efc5632ef7660a7 Mon Sep 17 00:00:00 2001
  2. From: Anatol Belski <ab@php.net>
  3. Date: Sun, 1 Apr 2018 01:03:40 +0200
  4. Subject: [PATCH] Simplify namespace access
  5. 

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

  8.  ext/intl/breakiterator/breakiterator_class.cpp            |  2 +-
  9.  ext/intl/breakiterator/breakiterator_class.h              |  2 +-
  10.  ext/intl/breakiterator/breakiterator_methods.cpp          |  4 ++--
  11.  ext/intl/breakiterator/codepointiterator_internal.cpp     |  2 +-
  12.  ext/intl/breakiterator/codepointiterator_internal.h       |  6 +++---
  13.  ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp |  4 ++--
  14.  ext/intl/calendar/calendar_class.cpp                      |  4 ++--
  15.  ext/intl/calendar/calendar_class.h                        |  2 +-
  16.  ext/intl/calendar/calendar_methods.cpp                    |  2 +-
  17.  ext/intl/calendar/gregoriancalendar_methods.cpp           |  8 ++++----
  18.  ext/intl/common/common_date.cpp                           |  4 ++--
  19.  ext/intl/common/common_date.h                             |  2 +-
  20.  ext/intl/common/common_enum.h                             |  2 +-
  21.  ext/intl/dateformat/dateformat_format_object.cpp          | 10 +++++-----
  22.  ext/intl/dateformat/dateformat_helpers.cpp                |  2 +-
  23.  ext/intl/dateformat/dateformat_helpers.h                  |  6 +++---
  24.  ext/intl/intl_convertcpp.h                                |  2 +-
  25.  ext/intl/msgformat/msgformat_helpers.cpp                  | 14 +++++++-------
  26.  ext/intl/timezone/timezone_class.cpp                      |  2 +-
  27.  ext/intl/timezone/timezone_class.h                        |  2 +-
  28.  ext/intl/timezone/timezone_methods.cpp                    |  4 ++--
  29.  21 files changed, 43 insertions(+), 43 deletions(-)
  30. 

  31. --- a/ext/intl/breakiterator/breakiterator_class.cpp

  32. +++ b/ext/intl/breakiterator/breakiterator_class.cpp

  33. @@ -38,7 +38,7 @@ extern "C" {

  34.  }
  35.  
  36.  using PHP::CodePointBreakIterator;
  37. -using U_ICU_NAMESPACE::RuleBasedBreakIterator;

  38. +using icu::RuleBasedBreakIterator;

  39.  
  40.  /* {{{ Global variables */
  41.  zend_class_entry *BreakIterator_ce_ptr;
  42. --- a/ext/intl/breakiterator/breakiterator_class.h

  43. +++ b/ext/intl/breakiterator/breakiterator_class.h

  44. @@ -27,7 +27,7 @@

  45.  #ifndef USE_BREAKITERATOR_POINTER
  46.  typedef void BreakIterator;
  47.  #else
  48. -using U_ICU_NAMESPACE::BreakIterator;

  49. +using icu::BreakIterator;

  50.  #endif
  51.  
  52.  typedef struct {
  53. --- a/ext/intl/breakiterator/breakiterator_methods.cpp

  54. +++ b/ext/intl/breakiterator/breakiterator_methods.cpp

  55. @@ -32,8 +32,8 @@ extern "C" {

  56.  }
  57.  
  58.  using PHP::CodePointBreakIterator;
  59. -using U_ICU_NAMESPACE::BreakIterator;

  60. -using U_ICU_NAMESPACE::Locale;

  61. +using icu::BreakIterator;

  62. +using icu::Locale;

  63.  
  64.  U_CFUNC PHP_METHOD(BreakIterator, __construct)
  65.  {
  66. --- a/ext/intl/breakiterator/codepointiterator_internal.cpp

  67. +++ b/ext/intl/breakiterator/codepointiterator_internal.cpp

  68. @@ -33,7 +33,7 @@ typedef union {

  69.  
  70.  using namespace PHP;
  71.  
  72. -using U_ICU_NAMESPACE::UCharCharacterIterator;

  73. +using icu::UCharCharacterIterator;

  74.  
  75.  UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
  76.  
  77. --- a/ext/intl/breakiterator/codepointiterator_internal.h

  78. +++ b/ext/intl/breakiterator/codepointiterator_internal.h

  79. @@ -20,9 +20,9 @@

  80.  #include <unicode/brkiter.h>
  81.  #include <unicode/unistr.h>
  82.  
  83. -using U_ICU_NAMESPACE::BreakIterator;

  84. -using U_ICU_NAMESPACE::CharacterIterator;

  85. -using U_ICU_NAMESPACE::UnicodeString;

  86. +using icu::BreakIterator;

  87. +using icu::CharacterIterator;

  88. +using icu::UnicodeString;

  89.  
  90.  namespace PHP {
  91.  
  92. --- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp

  93. +++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp

  94. @@ -26,8 +26,8 @@ extern "C" {

  95.  #include "../intl_convertcpp.h"
  96.  #include "../intl_common.h"
  97.  
  98. -using U_ICU_NAMESPACE::RuleBasedBreakIterator;

  99. -using U_ICU_NAMESPACE::Locale;

  100. +using icu::RuleBasedBreakIterator;

  101. +using icu::Locale;

  102.  
  103.  static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
  104.  	return (RuleBasedBreakIterator*)bio->biter;
  105. --- a/ext/intl/calendar/calendar_class.cpp

  106. +++ b/ext/intl/calendar/calendar_class.cpp

  107. @@ -34,8 +34,8 @@ extern "C" {

  108.  #include <assert.h>
  109.  }
  110.  
  111. -using U_ICU_NAMESPACE::GregorianCalendar;

  112. -using U_ICU_NAMESPACE::Locale;

  113. +using icu::GregorianCalendar;

  114. +using icu::Locale;

  115.  
  116.  /* {{{ Global variables */
  117.  zend_class_entry *Calendar_ce_ptr;
  118. --- a/ext/intl/calendar/calendar_class.h

  119. +++ b/ext/intl/calendar/calendar_class.h

  120. @@ -27,7 +27,7 @@

  121.  #ifndef USE_CALENDAR_POINTER
  122.  typedef void Calendar;
  123.  #else
  124. -using U_ICU_NAMESPACE::Calendar;

  125. +using icu::Calendar;

  126.  #endif
  127.  
  128.  typedef struct {
  129. --- a/ext/intl/calendar/calendar_methods.cpp

  130. +++ b/ext/intl/calendar/calendar_methods.cpp

  131. @@ -40,7 +40,7 @@ extern "C" {

  132.  }
  133.  #include "../common/common_enum.h"
  134.  
  135. -using U_ICU_NAMESPACE::Locale;

  136. +using icu::Locale;

  137.  
  138.  U_CFUNC PHP_METHOD(IntlCalendar, __construct)
  139.  {
  140. --- a/ext/intl/calendar/gregoriancalendar_methods.cpp

  141. +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp

  142. @@ -36,10 +36,10 @@ extern "C" {

  143.  #include "zend_exceptions.h"
  144.  }
  145.  
  146. -using U_ICU_NAMESPACE::GregorianCalendar;

  147. -using U_ICU_NAMESPACE::Locale;

  148. -using U_ICU_NAMESPACE::UnicodeString;

  149. -using U_ICU_NAMESPACE::StringPiece;

  150. +using icu::GregorianCalendar;

  151. +using icu::Locale;

  152. +using icu::UnicodeString;

  153. +using icu::StringPiece;

  154.  
  155.  static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
  156.  	return (GregorianCalendar*)co->ucal;
  157. --- a/ext/intl/common/common_date.cpp

  158. +++ b/ext/intl/common/common_date.cpp

  159. @@ -25,8 +25,8 @@ extern "C" {

  160.  #include <ext/date/php_date.h>
  161.  }
  162.  
  163. -using U_ICU_NAMESPACE::TimeZone;

  164. -using U_ICU_NAMESPACE::UnicodeString;

  165. +using icu::TimeZone;

  166. +using icu::UnicodeString;

  167.  
  168.  #include "zend_portability.h"
  169.  
  170. --- a/ext/intl/common/common_date.h

  171. +++ b/ext/intl/common/common_date.h

  172. @@ -28,7 +28,7 @@ U_CDECL_END

  173.  
  174.  #include <unicode/timezone.h>
  175.  
  176. -using U_ICU_NAMESPACE::TimeZone;

  177. +using icu::TimeZone;

  178.  
  179.  U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func);
  180.  U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
  181. --- a/ext/intl/common/common_enum.h

  182. +++ b/ext/intl/common/common_enum.h

  183. @@ -75,7 +75,7 @@ U_CFUNC zval *zoi_with_current_get_curre

  184.  U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
  185.  
  186.  #ifdef __cplusplus
  187. -using U_ICU_NAMESPACE::StringEnumeration;

  188. +using icu::StringEnumeration;

  189.  U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
  190.  #endif
  191.  
  192. --- a/ext/intl/dateformat/dateformat_format_object.cpp

  193. +++ b/ext/intl/dateformat/dateformat_format_object.cpp

  194. @@ -33,11 +33,11 @@ extern "C" {

  195.  #include "../common/common_date.h"
  196.  }
  197.  
  198. -using U_ICU_NAMESPACE::Locale;

  199. -using U_ICU_NAMESPACE::DateFormat;

  200. -using U_ICU_NAMESPACE::GregorianCalendar;

  201. -using U_ICU_NAMESPACE::StringPiece;

  202. -using U_ICU_NAMESPACE::SimpleDateFormat;

  203. +using icu::Locale;

  204. +using icu::DateFormat;

  205. +using icu::GregorianCalendar;

  206. +using icu::StringPiece;

  207. +using icu::SimpleDateFormat;

  208.  
  209.  static const DateFormat::EStyle valid_styles[] = {
  210.  		DateFormat::kNone,
  211. --- a/ext/intl/dateformat/dateformat_helpers.cpp

  212. +++ b/ext/intl/dateformat/dateformat_helpers.cpp

  213. @@ -28,7 +28,7 @@ extern "C" {

  214.  #include "../calendar/calendar_class.h"
  215.  }
  216.  
  217. -using U_ICU_NAMESPACE::GregorianCalendar;

  218. +using icu::GregorianCalendar;

  219.  
  220.  int datefmt_process_calendar_arg(zval* calendar_zv,
  221.  								 Locale const& locale,
  222. --- a/ext/intl/dateformat/dateformat_helpers.h

  223. +++ b/ext/intl/dateformat/dateformat_helpers.h

  224. @@ -28,9 +28,9 @@ extern "C" {

  225.  #include "../php_intl.h"
  226.  }
  227.  
  228. -using U_ICU_NAMESPACE::Locale;

  229. -using U_ICU_NAMESPACE::Calendar;

  230. -using U_ICU_NAMESPACE::DateFormat;

  231. +using icu::Locale;

  232. +using icu::Calendar;

  233. +using icu::DateFormat;

  234.  
  235.  int datefmt_process_calendar_arg(zval* calendar_zv,
  236.  								 Locale const& locale,
  237. --- a/ext/intl/intl_convertcpp.h

  238. +++ b/ext/intl/intl_convertcpp.h

  239. @@ -26,7 +26,7 @@

  240.  #include <unicode/unistr.h>
  241.  #include <zend_types.h>
  242.  
  243. -using U_ICU_NAMESPACE::UnicodeString;

  244. +using icu::UnicodeString;

  245.  
  246.  int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status);
  247.  
  248. --- a/ext/intl/msgformat/msgformat_helpers.cpp

  249. +++ b/ext/intl/msgformat/msgformat_helpers.cpp

  250. @@ -76,15 +76,15 @@ MessageFormatAdapter::getMessagePattern(

  251.  #endif
  252.  U_NAMESPACE_END
  253.  
  254. -using U_ICU_NAMESPACE::Formattable;

  255. -using U_ICU_NAMESPACE::Format;

  256. -using U_ICU_NAMESPACE::DateFormat;

  257. -using U_ICU_NAMESPACE::MessageFormat;

  258. +using icu::Formattable;

  259. +using icu::Format;

  260. +using icu::DateFormat;

  261. +using icu::MessageFormat;

  262.  #ifdef HAS_MESSAGE_PATTERN
  263. -using U_ICU_NAMESPACE::MessagePattern;

  264. +using icu::MessagePattern;

  265.  #endif
  266. -using U_ICU_NAMESPACE::MessageFormatAdapter;

  267. -using U_ICU_NAMESPACE::FieldPosition;

  268. +using icu::MessageFormatAdapter;

  269. +using icu::FieldPosition;

  270.  
  271.  U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
  272.  {
  273. --- a/ext/intl/timezone/timezone_class.cpp

  274. +++ b/ext/intl/timezone/timezone_class.cpp

  275. @@ -37,7 +37,7 @@ extern "C" {

  276.  #include <ext/date/php_date.h>
  277.  }
  278.  
  279. -using U_ICU_NAMESPACE::Calendar;

  280. +using icu::Calendar;

  281.  
  282.  /* {{{ Global variables */
  283.  U_CDECL_BEGIN
  284. --- a/ext/intl/timezone/timezone_class.h

  285. +++ b/ext/intl/timezone/timezone_class.h

  286. @@ -30,7 +30,7 @@

  287.  #ifndef USE_TIMEZONE_POINTER
  288.  typedef void TimeZone;
  289.  #else
  290. -using U_ICU_NAMESPACE::TimeZone;

  291. +using icu::TimeZone;

  292.  #endif
  293.  
  294.  typedef struct {
  295. --- a/ext/intl/timezone/timezone_methods.cpp

  296. +++ b/ext/intl/timezone/timezone_methods.cpp

  297. @@ -38,8 +38,8 @@ extern "C" {

  298.  }
  299.  #include "common/common_enum.h"
  300.  
  301. -using U_ICU_NAMESPACE::Locale;

  302. -using U_ICU_NAMESPACE::Calendar;

  303. +using icu::Locale;

  304. +using icu::Calendar;

  305.  
  306.  U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
  307.  {