diff options
| author | Preston A. Elder <prez.elder@mapbox.com> | 2020-02-03 12:04:10 -0500 |
|---|---|---|
| committer | Preston A. Elder <prez.elder@mapbox.com> | 2020-02-03 12:04:10 -0500 |
| commit | 34e945084ba88c251c172fd99768746fbf56ccb0 (patch) | |
| tree | 0f4f179c1e3ed8aa11b70a04ee78fcb87e0bf7df | |
| parent | 2e10d3548a8b3aff1f28b9514594c3c14509f084 (diff) | |
| download | qtlocation-mapboxgl-34e945084ba88c251c172fd99768746fbf56ccb0.tar.gz | |
Made number formatter handle ICU >=62 properly.
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | platform/default/src/mbgl/i18n/number_format.cpp | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject c82a0b8c89bb964824996e25f54c31cfaf419e6 +Subproject 8e8a28025dca26e258ad6a26c064d07596f1152 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); } |