From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sat, 1 Feb 2020 14:13:43 +0000 (+0000)
Subject: Fix incorrect parameter type to std::min() on m68k
X-Git-Tag: archive/raspbian/1%6.1.5-3+rpi1+deb10u6^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a9e6efdf3f497f071a17143f1fd8807a660c527d;p=libreoffice.git

Fix incorrect parameter type to std::min() on m68k

Last-Update: 2018-12-28


Gbp-Pq: Name m68k-fix-parameter-type.patch
---

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index ac3b2356789..30a6cef6f3c 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1660,7 +1660,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