Update icu x86_64 package with namespace renaming enabled.

"Renaming" means the icu namespace is suffixed with the version number,
atm icu_55. Using "renaming" allows to use two different versions of ICU,
thus easing upgrades. For instance haikuwebkit uses a current version of ICU,
while the system uses a newer one after an upgrade.

* Replace all uses of the icu namespace in our public headers, with a macro
defaulting to icu. As the namespace is only used for private fields pointers,
there should be no impact.
* Locale kit *.cpp have to import the macro from <unicode/uversion.h> *before*
including any locale headers. Ditto for a Time preferences cpp file. This way,
the correct current icu namespace is referenced.
* Fixes bug #12057.
This commit is contained in:
Jérôme Duval
2015-05-10 21:52:36 +02:00
parent 87af13952c
commit 73de58376a
27 changed files with 69 additions and 25 deletions
+3 -1
View File
@@ -5,13 +5,15 @@
*/
#include <unicode/uversion.h>
#include <Collator.h>
#include <ctype.h>
#include <stdlib.h>
#include <new>
#include <typeinfo>
#include <Collator.h>
#include <UnicodeChar.h>
#include <String.h>
#include <Message.h>
+1
View File
@@ -5,6 +5,7 @@
*/
#include <unicode/uversion.h>
#include <Country.h>
#include <AutoDeleter.h>
+1
View File
@@ -7,6 +7,7 @@
* Adrien Desutugues <[email protected]>
*/
#include <unicode/uversion.h>
#include <DateFormat.h>
#include <AutoDeleter.h>
+1
View File
@@ -6,6 +6,7 @@
* Oliver Tappe <[email protected]>
*/
#include <unicode/uversion.h>
#include <DateTimeFormat.h>
#include <AutoDeleter.h>
+1
View File
@@ -7,6 +7,7 @@
*/
#include <unicode/uversion.h>
#include <DurationFormat.h>
#include <new>
@@ -6,6 +6,7 @@
*/
#include <unicode/uversion.h>
#include <FormattingConventions.h>
#include <AutoDeleter.h>
+1
View File
@@ -4,6 +4,7 @@
*/
#include <unicode/uversion.h>
#include <Language.h>
#include <stdlib.h>
+1
View File
@@ -8,6 +8,7 @@
*/
#include <unicode/uversion.h>
#include <LocaleRoster.h>
#include <assert.h>
+1
View File
@@ -8,6 +8,7 @@
*/
#include <unicode/uversion.h>
#include <LocaleRosterData.h>
#include <Autolock.h>
+2
View File
@@ -6,6 +6,8 @@
* Adrien Destugues, pulkomandy@pulkomandy.tk
* John Scipione, jscipione@gmail.com
*/
#include <unicode/uversion.h>
#include <MessageFormat.h>
#include <Autolock.h>
+1
View File
@@ -6,6 +6,7 @@
*/
#include <unicode/uversion.h>
#include <NumberFormat.h>
#include <AutoDeleter.h>
+1
View File
@@ -6,6 +6,7 @@
* Oliver Tappe <zooey@hirschkaefer.de>
*/
#include <unicode/uversion.h>
#include <TimeFormat.h>
#include <AutoDeleter.h>
+1
View File
@@ -8,6 +8,7 @@
*/
#include <unicode/uversion.h>
#include <TimeUnitFormat.h>
#include <new>
+1
View File
@@ -8,6 +8,7 @@
*/
#include <unicode/uversion.h>
#include <TimeZone.h>
#include <new>
+1
View File
@@ -13,6 +13,7 @@
*/
#include <unicode/uversion.h>
#include "ZoneView.h"
#include <stdlib.h>