From 7e056403f7986f09981bf69514548e143bbb94b7 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Thu, 21 Mar 2013 10:51:00 +0200
Subject: std::min() parameters must be of same type

Change-Id: If8ac23dcf2a9e5811c1b2fe84c92d78cdfbc825b
---
 sal/osl/w32/profile.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sal/osl/w32')

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;
-- 
cgit v1.2.3