[Libreoffice-commits] core.git: sal/rtl

Michael Stahl mstahl at redhat.com
Wed Jan 13 06:14:23 PST 2016


 sal/rtl/math.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d526a9ffbad7effaabb70f4e52904c09d0ab22b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 13 15:11:14 2016 +0100

    sal: as always C++ is too stupid to deduce parameter types of min
    
    Change-Id: Ib00f29a6024e22c65a30bf4a45332e550994f03f

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 45d07b7..f382267 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -221,7 +221,7 @@ inline void doubleToString(StringT ** pResult,
             if (nDecPlaces == rtl_math_DecimalPlaces_Max || bEraseTrailingDecZeros)
                 nDecPlaces = 0;
             else
-                nDecPlaces = ::std::min( nDecPlaces, 15);
+                nDecPlaces = ::std::min<sal_Int32>(nDecPlaces, 15);
 
             // Max 1 sign, 16 integer digits, 15 group separators, 1 decimal
             // separator, 15 decimals digits.


More information about the Libreoffice-commits mailing list