diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 08:47:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-15 07:26:17 +0100 |
| commit | 7d8e94444d989d0ac4a4055b207726708e9ec0da (patch) | |
| tree | ce3e4a09ed7932496c4d901360ff23787c8f6e24 /sal/rtl/math.cxx | |
| parent | Fix typos (diff) | |
| download | core-7d8e94444d989d0ac4a4055b207726708e9ec0da.tar.gz core-7d8e94444d989d0ac4a4055b207726708e9ec0da.zip | |
convert a<b?a:b to std::min(a,b)
with something like
git grep -nP '(.*)\s*<\s*(.*)\s*\?\s*\g1\s*:\s*\g2' -- *.?xx
Change-Id: Id5078b35961847feb78a66204fdb7598ee63fd23
Note: we also convert a>b?b:a
Reviewed-on: https://gerrit.libreoffice.org/47736
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/rtl/math.cxx')
| -rw-r--r-- | sal/rtl/math.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index f8a0f9dcec47..4b149b9f99dd 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -443,7 +443,7 @@ inline void doubleToString(typename T::String ** pResult, // Round the number if(nDigits >= 0) { - if ((fValue += nRoundVal[nDigits > 15 ? 15 : nDigits] ) >= 10) + if ((fValue += nRoundVal[std::min<sal_Int32>(nDigits, 15)] ) >= 10) { fValue = 1.0; nExp++; |