cppu/source/typelib/typelib.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5bdffc57b15be047dc19ff300957498465d004c5
Author: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
AuthorDate: Fri Dec 28 12:13:24 2018 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 29 07:14:35 2018 +0100
typelib: Fix incorrect parameter type to std::min() on m68k
Change-Id: Id674d19d38ebe634707f5a480e596efe8c83cc6a
Reviewed-on: https://gerrit.libreoffice.org/65684
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 53dd020c97c6..9b288fabfd22 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1663,7 +1663,7 @@ extern "C" sal_Int32
typelib_typedescription_getAlignedUnoSize(
#ifdef __m68k__
// Anything that is at least 16 bits wide is aligned on a
16-bit
// boundary on the m68k default abi
- sal_Int32 nMaxAlign = std::min(rMaxIntegralTypeSize, 2);
+ sal_Int32 nMaxAlign = std::min(rMaxIntegralTypeSize,
sal_Int32( 2 ));
nStructSize = (nStructSize + nMaxAlign -1) / nMaxAlign *
nMaxAlign;
#else
// Example: A { double; int; } structure has a size of 16
instead of 10. The
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
