diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures index c1d15d2aa6..509ae529c1 100644 --- a/build/jam/BuildFeatures +++ b/build/jam/BuildFeatures @@ -104,8 +104,22 @@ if [ IsPackageAvailable icu_devel ] { $(developLibDir)/libicudata.so $(developLibDir)/libicui18n.so $(developLibDir)/libicuio.so - $(developLibDir)/libicule.so - $(developLibDir)/libiculx.so + $(developLibDir)/libicutu.so + $(developLibDir)/libicuuc.so + headers: $(developHeadersDir) + ; + + EnableBuildFeatures icu ; +} else if [ IsPackageAvailable icu66_devel ] { + ExtractBuildFeatureArchives icu : + file: base icu66 + runtime: lib + file: devel icu66_devel + depends: base + libraries: + $(developLibDir)/libicudata.so + $(developLibDir)/libicui18n.so + $(developLibDir)/libicuio.so $(developLibDir)/libicutu.so $(developLibDir)/libicuuc.so headers: $(developHeadersDir) diff --git a/headers/private/libroot/locale/ICUCategoryData.h b/headers/private/libroot/locale/ICUCategoryData.h index 82df10ccf8..2d6e042d2a 100644 --- a/headers/private/libroot/locale/ICUCategoryData.h +++ b/headers/private/libroot/locale/ICUCategoryData.h @@ -24,18 +24,20 @@ public: ICUCategoryData(pthread_key_t tlsKey); virtual ~ICUCategoryData(); - virtual status_t SetTo(const Locale& locale, + virtual status_t SetTo(const U_NAMESPACE_QUALIFIER Locale& + locale, const char* posixLocaleName); virtual status_t SetToPosix(); const char* PosixLocaleName() { return fPosixLocaleName; } - const Locale& ICULocale() const; + const U_NAMESPACE_QUALIFIER Locale& ICULocale() const; protected: status_t _ConvertUnicodeStringToLocaleconvEntry( - const UnicodeString& string, + const U_NAMESPACE_QUALIFIER UnicodeString& + string, char* destination, int destinationSize, const char* defaultValue = ""); @@ -45,7 +47,7 @@ protected: static const size_t skLCBufSize = 16; pthread_key_t fThreadLocalStorageKey; - Locale fLocale; + U_NAMESPACE_QUALIFIER Locale fLocale; char fPosixLocaleName[skMaxPosixLocaleNameLen]; char fGivenCharset[UCNV_MAX_CONVERTER_NAME_LENGTH]; @@ -55,7 +57,7 @@ private: inline -const Locale& +const U_NAMESPACE_QUALIFIER Locale& ICUCategoryData::ICULocale() const { return fLocale; diff --git a/headers/private/libroot/locale/ICUCollateData.h b/headers/private/libroot/locale/ICUCollateData.h index 7d73267d29..fe1c8a2b04 100644 --- a/headers/private/libroot/locale/ICUCollateData.h +++ b/headers/private/libroot/locale/ICUCollateData.h @@ -22,8 +22,9 @@ public: ICUCollateData(pthread_key_t tlsKey); virtual ~ICUCollateData(); - virtual status_t SetTo(const Locale& locale, - const char* posixLocaleName); + virtual status_t SetTo(const U_NAMESPACE_QUALIFIER Locale& + locale, + const char* posixLocaleName); virtual status_t SetToPosix(); status_t Strcoll(const char* a, const char* b, int& out); @@ -36,9 +37,9 @@ public: private: status_t _ToUnicodeString(const char* in, - UnicodeString& out); + U_NAMESPACE_QUALIFIER UnicodeString& out); - Collator* fCollator; + U_NAMESPACE_QUALIFIER Collator* fCollator; }; diff --git a/headers/private/libroot/locale/ICUCtypeData.h b/headers/private/libroot/locale/ICUCtypeData.h index 72b335ee9a..282153bf94 100644 --- a/headers/private/libroot/locale/ICUCtypeData.h +++ b/headers/private/libroot/locale/ICUCtypeData.h @@ -22,7 +22,8 @@ public: void Initialize(LocaleCtypeDataBridge* dataBridge); - virtual status_t SetTo(const Locale& locale, + virtual status_t SetTo(const U_NAMESPACE_QUALIFIER Locale& + locale, const char* posixLocaleName); virtual status_t SetToPosix(); diff --git a/headers/private/libroot/locale/ICULocaleconvData.h b/headers/private/libroot/locale/ICULocaleconvData.h index 8f5ba1c5b6..1992b5816c 100644 --- a/headers/private/libroot/locale/ICULocaleconvData.h +++ b/headers/private/libroot/locale/ICULocaleconvData.h @@ -15,7 +15,8 @@ namespace BPrivate { namespace Libroot { -typedef DecimalFormatSymbols::ENumberFormatSymbol FormatSymbol; +typedef U_NAMESPACE_QUALIFIER DecimalFormatSymbols::ENumberFormatSymbol + FormatSymbol; class ICULocaleconvData : public ICUCategoryData { typedef ICUCategoryData inherited; @@ -24,7 +25,8 @@ protected: ICULocaleconvData(pthread_key_t tlsKey); status_t _SetLocaleconvEntry( - const DecimalFormatSymbols* formatSymbols, + const U_NAMESPACE_QUALIFIER + DecimalFormatSymbols* formatSymbols, char* destination, FormatSymbol symbol, const char* defaultValue = ""); }; diff --git a/headers/private/libroot/locale/ICUMessagesData.h b/headers/private/libroot/locale/ICUMessagesData.h index 831939723a..10e4fc6215 100644 --- a/headers/private/libroot/locale/ICUMessagesData.h +++ b/headers/private/libroot/locale/ICUMessagesData.h @@ -20,7 +20,8 @@ class ICUMessagesData : public ICUCategoryData { public: ICUMessagesData(pthread_key_t tlsKey); - virtual status_t SetTo(const Locale& locale, + virtual status_t SetTo(const U_NAMESPACE_QUALIFIER Locale& + locale, const char* posixLocaleName); virtual status_t SetToPosix(); diff --git a/headers/private/libroot/locale/ICUMonetaryData.h b/headers/private/libroot/locale/ICUMonetaryData.h index 685bac73ca..32eb6174fe 100644 --- a/headers/private/libroot/locale/ICUMonetaryData.h +++ b/headers/private/libroot/locale/ICUMonetaryData.h @@ -32,7 +32,8 @@ public: void Initialize( LocaleMonetaryDataBridge* dataBridge); - virtual status_t SetTo(const Locale& locale, + virtual status_t SetTo(const U_NAMESPACE_QUALIFIER Locale& + locale, const char* posixLocaleName); virtual status_t SetToPosix(); @@ -43,15 +44,23 @@ private: static const int32 kSepBySpaceFlag = 1 << 1; int32 _DetermineCurrencyPosAndSeparator( - const UnicodeString& prefix, - const UnicodeString& suffix, - const UnicodeString& signSymbol, - const UnicodeString& currencySymbol, + const U_NAMESPACE_QUALIFIER + UnicodeString& prefix, + const U_NAMESPACE_QUALIFIER + UnicodeString& suffix, + const U_NAMESPACE_QUALIFIER + UnicodeString& signSymbol, + const U_NAMESPACE_QUALIFIER + UnicodeString& currencySymbol, UChar& currencySeparatorChar); - int32 _DetermineSignPos(const UnicodeString& prefix, - const UnicodeString& suffix, - const UnicodeString& signSymbol, - const UnicodeString& currencySymbol); + int32 _DetermineSignPos(const U_NAMESPACE_QUALIFIER + UnicodeString& prefix, + const U_NAMESPACE_QUALIFIER + UnicodeString& suffix, + const U_NAMESPACE_QUALIFIER + UnicodeString& signSymbol, + const U_NAMESPACE_QUALIFIER + UnicodeString& currencySymbol); char fDecimalPoint[skLCBufSize]; char fThousandsSep[skLCBufSize]; diff --git a/headers/private/libroot/locale/ICUNumericData.h b/headers/private/libroot/locale/ICUNumericData.h index 3df29bb66b..558f0344ad 100644 --- a/headers/private/libroot/locale/ICUNumericData.h +++ b/headers/private/libroot/locale/ICUNumericData.h @@ -23,7 +23,8 @@ public: void Initialize(LocaleNumericDataBridge* dataBridge); - virtual status_t SetTo(const Locale& locale, + virtual status_t SetTo(const U_NAMESPACE_QUALIFIER Locale& + locale, const char* posixLocaleName); virtual status_t SetToPosix(); diff --git a/headers/private/libroot/locale/ICUTimeConversion.h b/headers/private/libroot/locale/ICUTimeConversion.h index de56168cb8..c7b2b38315 100644 --- a/headers/private/libroot/locale/ICUTimeConversion.h +++ b/headers/private/libroot/locale/ICUTimeConversion.h @@ -35,14 +35,15 @@ public: status_t Mktime(struct tm* inOutTm, time_t& timeOut); private: - status_t _FillTmValues(const TimeZone* icuTimeZone, + status_t _FillTmValues(const U_NAMESPACE_QUALIFIER + TimeZone* icuTimeZone, const time_t* inTime, struct tm* tmOut); const ICUTimeData& fTimeData; TimeConversionDataBridge* fDataBridge; - TimeZone* fTimeZone; + U_NAMESPACE_QUALIFIER TimeZone* fTimeZone; char fTimeZoneID[B_FILE_NAME_LENGTH]; }; diff --git a/headers/private/libroot/locale/ICUTimeData.h b/headers/private/libroot/locale/ICUTimeData.h index aa1cbf315a..ea5e4e1542 100644 --- a/headers/private/libroot/locale/ICUTimeData.h +++ b/headers/private/libroot/locale/ICUTimeData.h @@ -31,19 +31,22 @@ public: void Initialize(LocaleTimeDataBridge* dataBridge); - virtual status_t SetTo(const Locale& locale, + virtual status_t SetTo(const U_NAMESPACE_QUALIFIER Locale& + locale, const char* posixLocaleName); virtual status_t SetToPosix(); const char* GetLanginfo(int index); - const Locale& ICULocaleForStrings() const; + const U_NAMESPACE_QUALIFIER Locale& ICULocaleForStrings() const; private: - status_t _SetLCTimeEntries(const UnicodeString* strings, + status_t _SetLCTimeEntries(const U_NAMESPACE_QUALIFIER + UnicodeString* strings, char* destination, int entrySize, int count, int maxCount); - status_t _SetLCTimePattern(DateFormat* format, + status_t _SetLCTimePattern(U_NAMESPACE_QUALIFIER + DateFormat* format, char* destination, int destinationSize); char fMon[12][24]; diff --git a/headers/private/locale/ICUWrapper.h b/headers/private/locale/ICUWrapper.h index b383e29337..b6b4e14efa 100644 --- a/headers/private/locale/ICUWrapper.h +++ b/headers/private/locale/ICUWrapper.h @@ -16,7 +16,7 @@ /* Convert UnicodeString to BString needs an ICU ByteSink to do the work */ -class BStringByteSink : public ByteSink { +class BStringByteSink : public U_NAMESPACE_QUALIFIER ByteSink { public: BStringByteSink(BString* dest) : fDest(dest) diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku index d2122bdf7a..eadccb7a7f 100644 --- a/src/data/package_infos/arm/haiku +++ b/src/data/package_infos/arm/haiku @@ -66,8 +66,6 @@ requires { lib:libicudata lib:libicui18n lib:libicuio - lib:libicule - lib:libiculx lib:libicutest lib:libicutu lib:libicuuc diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku index 0cbc08cac5..76d9b4d182 100644 --- a/src/data/package_infos/ppc/haiku +++ b/src/data/package_infos/ppc/haiku @@ -66,8 +66,6 @@ requires { lib:libicudata lib:libicui18n lib:libicuio - lib:libicule - lib:libiculx lib:libicutest lib:libicutu lib:libicuuc diff --git a/src/data/package_infos/riscv64/haiku b/src/data/package_infos/riscv64/haiku index fb236dc0d4..b5dd529277 100644 --- a/src/data/package_infos/riscv64/haiku +++ b/src/data/package_infos/riscv64/haiku @@ -66,8 +66,6 @@ requires { lib:libicudata >= 57 lib:libicui18n >= 57 lib:libicuio >= 57 - lib:libicule >= 57 - lib:libiculx >= 57 lib:libicutest >= 57 lib:libicutu >= 57 lib:libicuuc >= 57 diff --git a/src/data/package_infos/sparc/haiku b/src/data/package_infos/sparc/haiku index f34d7485a8..92439e0dc6 100644 --- a/src/data/package_infos/sparc/haiku +++ b/src/data/package_infos/sparc/haiku @@ -66,8 +66,6 @@ requires { lib:libicudata >= 57 lib:libicui18n >= 57 lib:libicuio >= 57 - lib:libicule >= 57 - lib:libiculx >= 57 lib:libicutest >= 57 lib:libicutu >= 57 lib:libicuuc >= 57 diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 68c11f8261..e9fdb7b599 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -67,8 +67,6 @@ requires { lib:libicudata >= 57 lib:libicui18n >= 57 lib:libicuio >= 57 - lib:libicule >= 57 - lib:libiculx >= 57 lib:libicutest >= 57 lib:libicutu >= 57 lib:libicuuc >= 57 diff --git a/src/data/package_infos/x86/haiku_secondary b/src/data/package_infos/x86/haiku_secondary index 11a06c0c28..fa18307b2b 100644 --- a/src/data/package_infos/x86/haiku_secondary +++ b/src/data/package_infos/x86/haiku_secondary @@ -27,8 +27,6 @@ requires { lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% - lib:libicule_%HAIKU_SECONDARY_PACKAGING_ARCH% - lib:libiculx_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 8c5a1a5605..03c97e9ece 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -67,8 +67,6 @@ requires { lib:libicudata >= 57 lib:libicui18n >= 57 lib:libicuio >= 57 - lib:libicule >= 57 - lib:libiculx >= 57 lib:libicutest >= 57 lib:libicutu >= 57 lib:libicuuc >= 57 diff --git a/src/data/package_infos/x86_64/haiku_secondary b/src/data/package_infos/x86_64/haiku_secondary index 8626479657..8f8dc0fe7a 100644 --- a/src/data/package_infos/x86_64/haiku_secondary +++ b/src/data/package_infos/x86_64/haiku_secondary @@ -28,8 +28,6 @@ requires { lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% - lib:libicule_%HAIKU_SECONDARY_PACKAGING_ARCH% - lib:libiculx_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index 9edd0f379c..92a738beb8 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -67,8 +67,6 @@ requires { lib:libicudata >= 57 lib:libicui18n >= 57 lib:libicuio >= 57 - lib:libicule >= 57 - lib:libiculx >= 57 lib:libicutest >= 57 lib:libicutu >= 57 lib:libicuuc >= 57 diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary index 4869933bab..4dcd8bfe41 100644 --- a/src/data/package_infos/x86_gcc2/haiku_secondary +++ b/src/data/package_infos/x86_gcc2/haiku_secondary @@ -27,8 +27,6 @@ requires { lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% - lib:libicule_%HAIKU_SECONDARY_PACKAGING_ARCH% - lib:libiculx_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% diff --git a/src/kits/locale/Collator.cpp b/src/kits/locale/Collator.cpp index 401557ab98..fd81bf5693 100644 --- a/src/kits/locale/Collator.cpp +++ b/src/kits/locale/Collator.cpp @@ -22,6 +22,9 @@ #include +U_NAMESPACE_USE + + BCollator::BCollator() : fIgnorePunctuation(true) diff --git a/src/kits/locale/Country.cpp b/src/kits/locale/Country.cpp index 7912908d2d..e905006b1b 100644 --- a/src/kits/locale/Country.cpp +++ b/src/kits/locale/Country.cpp @@ -28,6 +28,9 @@ #include +U_NAMESPACE_USE + + BCountry::BCountry(const char* countryCode) : fICULocale(NULL) diff --git a/src/kits/locale/DateFormat.cpp b/src/kits/locale/DateFormat.cpp index 656c916f4f..b2d28a98b8 100644 --- a/src/kits/locale/DateFormat.cpp +++ b/src/kits/locale/DateFormat.cpp @@ -27,6 +27,9 @@ #include +U_NAMESPACE_USE + + static const DateFormatSymbols::DtWidthType kDateFormatStyleToWidth[] = { DateFormatSymbols::WIDE, DateFormatSymbols::ABBREVIATED, diff --git a/src/kits/locale/DateTimeFormat.cpp b/src/kits/locale/DateTimeFormat.cpp index 7172257dd7..c8d7f34b53 100644 --- a/src/kits/locale/DateTimeFormat.cpp +++ b/src/kits/locale/DateTimeFormat.cpp @@ -22,6 +22,9 @@ #include +U_NAMESPACE_USE + + BDateTimeFormat::BDateTimeFormat(const BLocale* locale) : BFormat(locale) { diff --git a/src/kits/locale/DurationFormat.cpp b/src/kits/locale/DurationFormat.cpp index f00608a00b..08f3011b41 100644 --- a/src/kits/locale/DurationFormat.cpp +++ b/src/kits/locale/DurationFormat.cpp @@ -22,6 +22,9 @@ #include +U_NAMESPACE_USE + + // maps our unit element to the corresponding ICU unit static const UCalendarDateFields skUnitMap[] = { UCAL_YEAR, diff --git a/src/kits/locale/FormattingConventions.cpp b/src/kits/locale/FormattingConventions.cpp index 4e7160bf7f..5601634f61 100644 --- a/src/kits/locale/FormattingConventions.cpp +++ b/src/kits/locale/FormattingConventions.cpp @@ -33,6 +33,9 @@ #include +U_NAMESPACE_USE + + // #pragma mark - helpers diff --git a/src/kits/locale/Language.cpp b/src/kits/locale/Language.cpp index 9c0b8c2805..c37277217a 100644 --- a/src/kits/locale/Language.cpp +++ b/src/kits/locale/Language.cpp @@ -26,6 +26,9 @@ #include +U_NAMESPACE_USE + + BLanguage::BLanguage() : fDirection(B_LEFT_TO_RIGHT), diff --git a/src/kits/locale/LocaleRoster.cpp b/src/kits/locale/LocaleRoster.cpp index 57047a7cf0..dee3807a28 100644 --- a/src/kits/locale/LocaleRoster.cpp +++ b/src/kits/locale/LocaleRoster.cpp @@ -43,6 +43,7 @@ using BPrivate::CatalogAddOnInfo; using BPrivate::MutableLocaleRoster; +U_NAMESPACE_USE /* diff --git a/src/kits/locale/LocaleRosterData.cpp b/src/kits/locale/LocaleRosterData.cpp index d98586826c..0859805736 100644 --- a/src/kits/locale/LocaleRosterData.cpp +++ b/src/kits/locale/LocaleRosterData.cpp @@ -36,6 +36,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { diff --git a/src/kits/locale/NumberFormat.cpp b/src/kits/locale/NumberFormat.cpp index 0b95a73051..546f576737 100644 --- a/src/kits/locale/NumberFormat.cpp +++ b/src/kits/locale/NumberFormat.cpp @@ -21,6 +21,9 @@ #include +U_NAMESPACE_USE + + class BNumberFormatImpl { public: BNumberFormatImpl(); diff --git a/src/kits/locale/RelativeDateTimeFormat.cpp b/src/kits/locale/RelativeDateTimeFormat.cpp index 6b43885e77..7951dae18e 100644 --- a/src/kits/locale/RelativeDateTimeFormat.cpp +++ b/src/kits/locale/RelativeDateTimeFormat.cpp @@ -25,6 +25,9 @@ #include +U_NAMESPACE_USE + + static const URelativeDateTimeUnit kTimeUnitToRelativeDateTime[] = { UDAT_REL_UNIT_YEAR, UDAT_REL_UNIT_MONTH, diff --git a/src/kits/locale/StringFormat.cpp b/src/kits/locale/StringFormat.cpp index e71190aace..eed345d50e 100644 --- a/src/kits/locale/StringFormat.cpp +++ b/src/kits/locale/StringFormat.cpp @@ -19,6 +19,9 @@ #include +U_NAMESPACE_USE + + BStringFormat::BStringFormat(const BLanguage& language, const BString pattern) : BFormat(language, BFormattingConventions()) { diff --git a/src/kits/locale/TimeFormat.cpp b/src/kits/locale/TimeFormat.cpp index 55cc534299..230cc2a13f 100644 --- a/src/kits/locale/TimeFormat.cpp +++ b/src/kits/locale/TimeFormat.cpp @@ -24,6 +24,9 @@ #include +U_NAMESPACE_USE + + BTimeFormat::BTimeFormat() : BFormat() { diff --git a/src/kits/locale/TimeUnitFormat.cpp b/src/kits/locale/TimeUnitFormat.cpp index a47dee7128..d34654505e 100644 --- a/src/kits/locale/TimeUnitFormat.cpp +++ b/src/kits/locale/TimeUnitFormat.cpp @@ -23,6 +23,10 @@ #include #include + +U_NAMESPACE_USE + + // maps our unit element to the corresponding ICU unit static const TimeUnit::UTimeUnitFields skUnitMap[] = { TimeUnit::UTIMEUNIT_YEAR, diff --git a/src/kits/locale/TimeZone.cpp b/src/kits/locale/TimeZone.cpp index d4860c6463..b2bddeaa30 100644 --- a/src/kits/locale/TimeZone.cpp +++ b/src/kits/locale/TimeZone.cpp @@ -20,6 +20,9 @@ #include +U_NAMESPACE_USE + + const char* BTimeZone::kNameOfGmtZone = "GMT"; diff --git a/src/system/libroot/add-ons/icu/ICUCategoryData.cpp b/src/system/libroot/add-ons/icu/ICUCategoryData.cpp index a2ca4c13f1..e37912cc97 100644 --- a/src/system/libroot/add-ons/icu/ICUCategoryData.cpp +++ b/src/system/libroot/add-ons/icu/ICUCategoryData.cpp @@ -11,6 +11,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICUCollateData.cpp b/src/system/libroot/add-ons/icu/ICUCollateData.cpp index b949db290e..4c32b11326 100644 --- a/src/system/libroot/add-ons/icu/ICUCollateData.cpp +++ b/src/system/libroot/add-ons/icu/ICUCollateData.cpp @@ -15,6 +15,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICUCtypeData.cpp b/src/system/libroot/add-ons/icu/ICUCtypeData.cpp index 4ff11acde7..5e4319d483 100644 --- a/src/system/libroot/add-ons/icu/ICUCtypeData.cpp +++ b/src/system/libroot/add-ons/icu/ICUCtypeData.cpp @@ -27,6 +27,9 @@ #endif +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp b/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp index 21538c6d10..3f226f29a6 100644 --- a/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp +++ b/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp @@ -16,6 +16,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICULocaleconvData.cpp b/src/system/libroot/add-ons/icu/ICULocaleconvData.cpp index 13459745ca..e91820bd20 100644 --- a/src/system/libroot/add-ons/icu/ICULocaleconvData.cpp +++ b/src/system/libroot/add-ons/icu/ICULocaleconvData.cpp @@ -9,6 +9,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICUMessagesData.cpp b/src/system/libroot/add-ons/icu/ICUMessagesData.cpp index 5ed7c9a95c..6baebf0541 100644 --- a/src/system/libroot/add-ons/icu/ICUMessagesData.cpp +++ b/src/system/libroot/add-ons/icu/ICUMessagesData.cpp @@ -10,6 +10,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp b/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp index 03d7634dd5..f26221526c 100644 --- a/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp +++ b/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp @@ -12,6 +12,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICUNumericData.cpp b/src/system/libroot/add-ons/icu/ICUNumericData.cpp index f0e12ee43d..cdde2dec92 100644 --- a/src/system/libroot/add-ons/icu/ICUNumericData.cpp +++ b/src/system/libroot/add-ons/icu/ICUNumericData.cpp @@ -12,6 +12,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp b/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp index 461a0f1a63..1a2d749e2b 100644 --- a/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp +++ b/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp @@ -13,6 +13,9 @@ #include +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot { diff --git a/src/system/libroot/add-ons/icu/ICUTimeData.cpp b/src/system/libroot/add-ons/icu/ICUTimeData.cpp index a0bfcfdbf1..985f0f19f4 100644 --- a/src/system/libroot/add-ons/icu/ICUTimeData.cpp +++ b/src/system/libroot/add-ons/icu/ICUTimeData.cpp @@ -18,6 +18,10 @@ #include "ICUMessagesData.h" + +U_NAMESPACE_USE + + namespace BPrivate { namespace Libroot {