include/o3tl/safeint.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9ab68b9fb02797f9b5242ae0e7cc406a5a1b1adc
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Aug 29 13:49:03 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Aug 29 15:10:16 2018 +0200
32-bit Clang trunk (towards Clang 9) still doesn't have __mulodi4
Change-Id: I7579ff88d34c931a51c820b53960a281e6e3678e
Reviewed-on: https://gerrit.libreoffice.org/59763
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index fa08b6dfc899..6f879965840c 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -112,8 +112,8 @@ template<typename T> inline bool checked_sub(T a, T b, T&
result)
return !msl::utilities::SafeSubtract(a, b, result);
}
-#elif (defined __GNUC__ && __GNUC__ >= 5) ||
(__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined
__clang__) && !(defined(__clang__) && defined(__i386__) && __clang_major__ ==
4))
-// 32-bit clang 4.0.1 fails with undefined reference to `__mulodi4'
+#elif (defined __GNUC__ && __GNUC__ >= 5) ||
(__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined
__clang__) && !(defined(__clang__) && defined(__i386__)))
+// 32-bit clang fails with undefined reference to `__mulodi4'
template<typename T> inline bool checked_multiply(T a, T b, T& result)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
