diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-29 02:09:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-29 02:09:34 +0100 |
| commit | bb20d37025318d5a2fb35689c26c3600a625ed68 (patch) | |
| tree | 8dafc1291daa6d47d4f0d6fc7068d8f32f5e59f4 /tools | |
| parent | 64febc8feffd0968a433fa366e0a0c82cdff47c6 (diff) | |
tools: try to fix std::min ambiguity for MSVC
Change-Id: Id81ad8702d513c5bb3f4f8de2f9d7c75c7852d4d
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/stream/stream.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 086f79725c33..48cae55f0169 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -265,7 +265,8 @@ ErrCode SvAsyncLockBytes::ReadAt(sal_uInt64 const nPos, void * pBuffer, sal_Size return SvOpenLockBytes::ReadAt(nPos, pBuffer, nCount, pRead); else { - sal_Size nTheCount = std::min(nPos < m_nSize ? m_nSize - nPos : 0, nCount); + sal_Size nTheCount = + std::min<sal_Size>(nPos < m_nSize ? m_nSize - nPos : 0, nCount); ErrCode nError = SvOpenLockBytes::ReadAt(nPos, pBuffer, nTheCount, pRead); return !nCount || nTheCount == nCount || nError ? nError : @@ -281,7 +282,8 @@ ErrCode SvAsyncLockBytes::WriteAt(sal_uInt64 const nPos, const void * pBuffer, return SvOpenLockBytes::WriteAt(nPos, pBuffer, nCount, pWritten); else { - sal_Size nTheCount = std::min(nPos < m_nSize ? m_nSize - nPos : 0, nCount); + sal_Size nTheCount = + std::min<sal_Size>(nPos < m_nSize ? m_nSize - nPos : 0, nCount); ErrCode nError = SvOpenLockBytes::WriteAt(nPos, pBuffer, nTheCount, pWritten); return !nCount || nTheCount == nCount || nError ? nError : |