diff options
| author | Preston A. Elder <prez.elder@mapbox.com> | 2020-02-04 09:08:13 -0500 |
|---|---|---|
| committer | Preston A. Elder <prez.elder@mapbox.com> | 2020-02-04 09:08:13 -0500 |
| commit | 09e2dd196443da362c8428c95f4c7a4916ec9d42 (patch) | |
| tree | 5a867e96b965e7eab8163e19768068b9db0b2ae4 | |
| parent | 86cd344bbe9634a3e6cfe13b62d59f529c7ab17f (diff) | |
| download | qtlocation-mapboxgl-upstream/number_format_i18n_fix2.tar.gz | |
Made number format work for newer versions of ICUupstream/number_format_i18n_fix2
| -rw-r--r-- | platform/default/src/mbgl/i18n/number_format.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/platform/default/src/mbgl/i18n/number_format.cpp b/platform/default/src/mbgl/i18n/number_format.cpp index 7f2bc5a5ef..ded4495202 100644 --- a/platform/default/src/mbgl/i18n/number_format.cpp +++ b/platform/default/src/mbgl/i18n/number_format.cpp @@ -22,7 +22,11 @@ std::string formatNumber(double number, .unit(icu::CurrencyUnit(ucurrency.getBuffer(), status)) .locale(locale) .formatDouble(number, status) +#if U_ICU_VERSION_MAJOR_NUM >= 62 + .toString(status); +#else .toString(); +#endif } else { ustr = icu::number::NumberFormatter::with() #if U_ICU_VERSION_MAJOR_NUM >= 62 @@ -32,7 +36,11 @@ std::string formatNumber(double number, #endif .locale(locale) .formatDouble(number, status) +#if U_ICU_VERSION_MAJOR_NUM >= 62 + .toString(status); +#else .toString(); +#endif } return ustr.toUTF8String(formatted); } |