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/cipher.cxx | |
| parent | 80fb8d406ced47e6a2089f0c8ba5c103d2fec91f (diff) | |
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/cipher.cxx')
| -rw-r--r-- | sal/rtl/cipher.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index 9a64ac4364b0..62f3104be3ed 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -22,6 +22,7 @@ #include <sal/types.h> #include <rtl/alloc.h> #include <rtl/cipher.h> +#include <algorithm> #define RTL_CIPHER_NTOHL(c, l) \ ((l) = (static_cast<sal_uInt32>(*((c)++))) << 24, \ @@ -660,7 +661,7 @@ static rtlCipherError BF_init( if (pArgData && nArgLen) { - nArgLen = ((nArgLen < 8) ? nArgLen : 8); + nArgLen = std::min<sal_Size>(nArgLen, 8); if (eMode == rtl_Cipher_ModeStream) { memcpy(ctx->m_iv.m_byte, pArgData, nArgLen); |