Changeset 82787 in webkit

Timestamp:

Apr 2, 2011 9:55:07 PM (13 years ago)

Author:

thakis@chromium.org

Message:

2011-04-02 Nico Weber <​thakis@chromium.org>

Reviewed by Adam Barth.

Explicitly use icu namespace for ports building with U_USING_ICU_NAMESPACE=0

By default, ICU includes |using namespace icu;| in its header files
for backwards compatibility. Clients can define
U_USING_ICU_NAMESPACE=0 to tell ICU to not do this. Prefixing all ICU
classes with |icu::| makes this file compile no matter what
U_USING_ICU_NAMESPACE is set to.

​https://bugs.webkit.org/show_bug.cgi?id=57715

• platform/text/LocalizedNumberICU.cpp: (WebCore::createFormatterForCurrentLocale): (WebCore::numberFormatter): (WebCore::parseLocalizedNumber): (WebCore::formatLocalizedNumber):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/LocalizedNumberICU.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-02  Nico Weber  <thakis@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Explicitly use icu namespace for ports building with U_USING_ICU_NAMESPACE=0
+
+        By default, ICU includes |using namespace icu;| in its header files
+        for backwards compatibility. Clients can define
+        U_USING_ICU_NAMESPACE=0 to tell ICU to not do this. Prefixing all ICU
+        classes with |icu::| makes this file compile no matter what
+        U_USING_ICU_NAMESPACE is set to.
+
+        https://bugs.webkit.org/show_bug.cgi?id=57715
+
+        * platform/text/LocalizedNumberICU.cpp:
+        (WebCore::createFormatterForCurrentLocale):
+        (WebCore::numberFormatter):
+        (WebCore::parseLocalizedNumber):
+        (WebCore::formatLocalizedNumber):
+
 2011-04-02  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/text/LocalizedNumberICU.cpp

@@ -42 +42 @@
 namespace WebCore {
 
-static PassOwnPtr<NumberFormat> createFormatterForCurrentLocale()
+static PassOwnPtr<icu::NumberFormat> createFormatterForCurrentLocale()
 {
     UErrorCode status = U_ZERO_ERROR;
-    OwnPtr<NumberFormat> formatter = adoptPtr(NumberFormat::createInstance(status));
+    OwnPtr<icu::NumberFormat> formatter = adoptPtr(icu::NumberFormat::createInstance(status));
     return U_SUCCESS(status) ? formatter.release() : 0;
 }
 
 // This might return 0.
-static NumberFormat* numberFormatter()
+static icu::NumberFormat* numberFormatter()
 {
     ASSERT(isMainThread());
-    static NumberFormat* formatter = createFormatterForCurrentLocale().leakPtr();
+    static icu::NumberFormat* formatter = createFormatterForCurrentLocale().leakPtr();
     return formatter;
 }
@@ -61 +61 @@
     if (numberString.isEmpty())
         return numeric_limits<double>::quiet_NaN();
-    NumberFormat* formatter = numberFormatter();
+    icu::NumberFormat* formatter = numberFormatter();
     if (!formatter)
         return numeric_limits<double>::quiet_NaN();
-    UnicodeString numberUnicodeString(numberString.characters(), numberString.length());
-    Formattable result;
-    ParsePosition position(0);
+    icu::UnicodeString numberUnicodeString(numberString.characters(), numberString.length());
+    icu::Formattable result;
+    icu::ParsePosition position(0);
     formatter->parse(numberUnicodeString, result, position);
     if (position.getIndex() != numberUnicodeString.length())
@@ -77 +77 @@
 String formatLocalizedNumber(double number, unsigned fractionDigits)
 {
-    NumberFormat* formatter = numberFormatter();
+    icu::NumberFormat* formatter = numberFormatter();
     if (!formatter)
         return String();
-    UnicodeString result;
+    icu::UnicodeString result;
     formatter->setMaximumFractionDigits(clampToInteger(fractionDigits));
     formatter->format(number, result);