diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-03-21 10:51:00 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-03-21 13:07:41 +0200 |
| commit | 7e056403f7986f09981bf69514548e143bbb94b7 (patch) | |
| tree | 62f2321be91ac22154547e46a4d6fdb434ffdfd1 /sal | |
| parent | 4dcef369040be95df4040737f7246c3fc588fd02 (diff) | |
std::min() parameters must be of same type
Change-Id: If8ac23dcf2a9e5811c1b2fe84c92d78cdfbc825b
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/profile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index 7477e3f0853c..dd95669b2e62 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -1321,7 +1321,7 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen) (pChr < (pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf) - 1)); pChr++); - Max = min(pChr - pFile->m_pReadPtr, MaxLen); + Max = min((int) (pChr - pFile->m_pReadPtr), MaxLen); memcpy(pLine, pFile->m_pReadPtr, Max); MaxLen -= Max; pLine += Max; |