Skip to content

C
core
Kaydet (Commit) bb20d370 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

tools: try to fix std::min ambiguity for MSVC 

Change-Id: Id81ad8702d513c5bb3f4f8de2f9d7c75c7852d4d
üst 64febc8f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
tools/source/stream/stream.cxx
Dosyayı görüntüle @ bb20d370
...@@ -265,7 +265,8 @@ ErrCode SvAsyncLockBytes::ReadAt(sal_uInt64 const nPos, void * pBuffer, sal_Size ...@@ -265,7 +265,8 @@ ErrCode SvAsyncLockBytes::ReadAt(sal_uInt64 const nPos, void * pBuffer, sal_Size
return SvOpenLockBytes::ReadAt(nPos, pBuffer, nCount, pRead); return SvOpenLockBytes::ReadAt(nPos, pBuffer, nCount, pRead);
else 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, ErrCode nError = SvOpenLockBytes::ReadAt(nPos, pBuffer, nTheCount,
pRead); pRead);
return !nCount || nTheCount == nCount || nError ? nError : return !nCount || nTheCount == nCount || nError ? nError :
...@@ -281,7 +282,8 @@ ErrCode SvAsyncLockBytes::WriteAt(sal_uInt64 const nPos, const void * pBuffer, ...@@ -281,7 +282,8 @@ ErrCode SvAsyncLockBytes::WriteAt(sal_uInt64 const nPos, const void * pBuffer,
return SvOpenLockBytes::WriteAt(nPos, pBuffer, nCount, pWritten); return SvOpenLockBytes::WriteAt(nPos, pBuffer, nCount, pWritten);
else 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, ErrCode nError = SvOpenLockBytes::WriteAt(nPos, pBuffer, nTheCount,
pWritten); pWritten);
return !nCount || nTheCount == nCount || nError ? nError : return !nCount || nTheCount == nCount || nError ? nError :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment