summaryrefslogtreecommitdiff
path: root/external/icu
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-11-21 12:47:29 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-11-21 12:47:29 +0100
commitcf39dec92d7c757c9bb5c0d95c0929d9f4e7ceb7 (patch)
tree9f135c240d97d68dfb992368d7353a809d362ffb /external/icu
parentc8b0bd4f755c427e1e66d5c12d2a49d32fa64373 (diff)
buildfix for icu/android – no member named 'round' in namespace 'std'
"number_decimalquantity.cpp:387:40: error: no member named 'round' in namespace 'std'; did you mean simply 'round'?" auto result = static_cast<int64_t>(std::round(n)); ^~~~~~~~~~ round /home/cl/Android/Sdk/ndk-bundle/platforms/android-14/arch-x86/usr/include/math.h:279:8: note: 'round' declared here double round(double); ^ Change-Id: If4dc1054469f234bfa9713eded1d325c71f9f79c
Diffstat (limited to 'external/icu')
-rw-r--r--external/icu/icu4c-android.patch.112
1 files changed, 12 insertions, 0 deletions
diff --git a/external/icu/icu4c-android.patch.1 b/external/icu/icu4c-android.patch.1
index c62cf54e5936..9c87a436055c 100644
--- a/external/icu/icu4c-android.patch.1
+++ b/external/icu/icu4c-android.patch.1
@@ -56,3 +56,15 @@ diff -ur icu.org/source/configure icu/source/configure
*)
;;
esac
+diff -ur icu.org/source/i18n/number_decimalquantity.cpp icu/source/i18n/number_decimalquantity.cpp
+--- icu.org/source/i18n/number_decimalquantity.cpp 2017-11-21 12:39:25.068592814 +0100
++++ icu/source/i18n/number_decimalquantity.cpp 2017-11-21 12:39:53.988590886 +0100
+@@ -384,7 +384,7 @@
+ for (; i <= -22; i += 22) n /= 1e22;
+ n /= DOUBLE_MULTIPLIERS[-i];
+ }
+- auto result = static_cast<int64_t>(std::round(n));
++ auto result = static_cast<int64_t>(round(n));
+ if (result != 0) {
+ _setToLong(result);
+ scale -= fracLength;