1--- source/i18n/ucurr.cpp 2009-04-29 18:41:28.000000000 -0700 2+++ source/i18n/ucurr.cpp 2009-08-15 09:05:07.120474000 -0700 3@@ -708,6 +708,7 @@ 4 // all currency names in "en_US" and "en". 5 static void 6 getCurrencyNameCount(const char* loc, int32_t* total_currency_name_count, int32_t* total_currency_symbol_count) { 7+ U_NAMESPACE_USE 8 *total_currency_name_count = 0; 9 *total_currency_symbol_count = 0; 10 const UChar* s = NULL; 11@@ -794,6 +795,7 @@ 12 CurrencyNameStruct** currencySymbols, 13 int32_t* total_currency_symbol_count, 14 UErrorCode& ec) { 15+ U_NAMESPACE_USE 16 // Look up the Currencies resource for the given locale. 17 UErrorCode ec2 = U_ZERO_ERROR; 18 19--- source/i18n/bms.cpp 2009-05-04 20:49:30.000000000 -0700 20+++ source/i18n/bms.cpp 2009-08-15 09:05:07.125462000 -0700 21@@ -23,6 +23,8 @@ 22 #define CONST_CAST(type,value) (type) (value) 23 #endif 24 25+U_NAMESPACE_USE 26+ 27 U_CAPI UCD * U_EXPORT2 28 ucd_open(UCollator *coll, UErrorCode *status) 29 { 30--- source/i18n/wintzimpl.cpp 2009-06-24 14:06:38.000000000 -0700 31+++ source/i18n/wintzimpl.cpp 2009-08-17 23:48:59.278072000 -0700 32@@ -1,6 +1,6 @@ 33 /* 34 ******************************************************************************** 35-* Copyright (C) 2008, International Business Machines 36+* Copyright (C) 2009, International Business Machines 37 * Corporation and others. All Rights Reserved. 38 ******************************************************************************** 39 * 40@@ -30,6 +30,8 @@ 41 42 #include <windows.h> 43 44+U_NAMESPACE_USE 45+ 46 static UBool getSystemTimeInformation(TimeZone *tz, SYSTEMTIME &daylightDate, SYSTEMTIME &standardDate, int32_t &bias, int32_t &daylightBias, int32_t &standardBias) { 47 UErrorCode status = U_ZERO_ERROR; 48 UBool result = TRUE; 49--- source/tools/toolutil/pkg_icu.h 2009-06-24 14:06:38.000000000 -0700 50+++ source/tools/toolutil/pkg_icu.h 2009-08-15 09:05:07.128458000 -0700 51@@ -13,10 +13,10 @@ 52 53 U_CAPI int U_EXPORT2 54 writePackageDatFile(const char *outFilename, const char *outComment, 55- const char *sourcePath, const char *addList, Package *pkg, 56+ const char *sourcePath, const char *addList, U_NAMESPACE_QUALIFIER Package *pkg, 57 char outType); 58 59-U_CAPI Package * U_EXPORT2 60+U_CAPI U_NAMESPACE_QUALIFIER Package * U_EXPORT2 61 readList(const char *filesPath, const char *listname, UBool readContents); 62 63 #endif 64--- source/tools/toolutil/pkg_icu.cpp 2009-06-24 14:06:38.000000000 -0700 65+++ source/tools/toolutil/pkg_icu.cpp 2009-08-15 09:05:07.131458000 -0700 66@@ -21,6 +21,8 @@ 67 68 // read a file list -------------------------------------------------------- *** 69 70+U_NAMESPACE_USE 71+ 72 static const struct { 73 const char *suffix; 74 int32_t length; 75--- source/common/unicode/uversion.h 2009-06-26 08:16:13.000000000 -0700 76+++ source/common/unicode/uversion.h 2009-08-17 23:51:53.980054000 -0700 77@@ -174,7 +174,9 @@ 78 # define U_NAMESPACE_QUALIFIER U_ICU_NAMESPACE:: 79 80 # ifndef U_USING_ICU_NAMESPACE 81-# define U_USING_ICU_NAMESPACE 1 82+ /* Chrome-specific: Set to 0 to force namespace 83+ declarations in Chrome ICU usage. */ 84+# define U_USING_ICU_NAMESPACE 0 85 # endif 86 # if U_USING_ICU_NAMESPACE 87 U_NAMESPACE_USE 88