ICU 4.6 NumberFormat::EStyle enum is gone in ICU 4.8. Adding #if #else to make it work across ver...

src/extensions/experimental/number-format.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 18 matching lines @@
 
 #include <string.h>
 
 #include "src/extensions/experimental/i18n-utils.h"
 #include "unicode/dcfmtsym.h"
 #include "unicode/decimfmt.h"
 #include "unicode/locid.h"
 #include "unicode/numfmt.h"
 #include "unicode/uchar.h"
 #include "unicode/ucurr.h"
+#include "unicode/unum.h"
+#include "unicode/uversion.h"
 
 namespace v8 {
 namespace internal {
 
 const int NumberFormat::kCurrencyCodeLength = 4;
 
 v8::Persistent<v8::FunctionTemplate> NumberFormat::number_format_template_;
 
 static icu::DecimalFormat* CreateNumberFormat(v8::Handle<v8::String>,
                                               v8::Handle<v8::String>,
@@ skipping 175 matching lines @@
 
   UChar currency_code[NumberFormat::kCurrencyCodeLength];
   if (GetCurrencyCode(icu_locale, *ascii_region, settings, currency_code)) {
     number_format->setCurrency(currency_code, status);
   }
 
   return number_format;
 }
 
 // Generates ICU number format pattern from given skeleton.
+// TODO(cira): Remove once ICU includes equivalent method
+// (see http://bugs.icu-project.org/trac/ticket/8610).
 static icu::DecimalFormat* CreateFormatterFromSkeleton(
     const icu::Locale& icu_locale,
     const icu::UnicodeString& skeleton,
     UErrorCode* status) {
   icu::DecimalFormat skeleton_format(
       skeleton, GetFormatSymbols(icu_locale), *status);
 
   // Find out if skeleton contains currency or percent symbol and create
   // proper instance to tweak.
   icu::DecimalFormat* base_format = NULL;
 
   // UChar representation of U+00A4 currency symbol.
   const UChar currency_symbol = 0xA4u;
 
   int32_t index = skeleton.indexOf(currency_symbol);
   if (index != -1) {
     // Find how many U+00A4 are there. There is at least one.
     // Case of non-consecutive U+00A4 is taken care of in i18n.js.
     int32_t end_index = skeleton.lastIndexOf(currency_symbol, index);
 
+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 6)
     icu::NumberFormat::EStyles style;
     switch (end_index - index) {
       case 0:
         style = icu::NumberFormat::kCurrencyStyle;
         break;
       case 1:
         style = icu::NumberFormat::kIsoCurrencyStyle;
         break;
       default:
         style = icu::NumberFormat::kPluralCurrencyStyle;
     }
+#else  // ICU version is 4.8 or above (we ignore versions below 4.0).
+    UNumberFormatStyle style;
+    switch (end_index - index) {
+      case 0:
+        style = UNUM_CURRENCY;
+        break;
+      case 1:
+        style = UNUM_CURRENCY_ISO;
+        break;
+      default:
+        style = UNUM_CURRENCY_PLURAL;
+    }
+#endif
 
     base_format = static_cast<icu::DecimalFormat*>(
         icu::NumberFormat::createInstance(icu_locale, style, *status));
   } else if (skeleton.indexOf('%') != -1) {
     base_format = static_cast<icu::DecimalFormat*>(
         icu::NumberFormat::createPercentInstance(icu_locale, *status));
   } else {
     // TODO(cira): Handle scientific skeleton.
     base_format = static_cast<icu::DecimalFormat*>(
         icu::NumberFormat::createInstance(icu_locale, *status));
@@ skipping 72 matching lines @@
 
 // Throws a JavaScript exception.
 static v8::Handle<v8::Value> ThrowUnexpectedObjectError() {
   // Returns undefined, and schedules an exception to be thrown.
   return v8::ThrowException(v8::Exception::Error(
       v8::String::New("NumberFormat method called on an object "
                       "that is not a NumberFormat.")));
 }
 
 } }  // namespace v8::internal