Added template parameters to std::min to fix compile errors in Visual…

… Studio x64.

https://bugs.webkit.org/show_bug.cgi?id=118204

Reviewed by Geoffrey Garen.

* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::writeURLToDataObject): Added <unsigned> to std::min.
(WebCore::createGlobalImageFileDescriptor): Added <int> to std::min.


Canonical link: https://commits.webkit.org/136246@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@152193 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

@@ -1,3 +1,14 @@
+2013-06-28  Alex Christensen  <achristensen@apple.com>
+
+        Added template parameters to std::min to fix compile errors in Visual Studio x64.
+        https://bugs.webkit.org/show_bug.cgi?id=118204
+
+        Reviewed by Geoffrey Garen.
+
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::writeURLToDataObject): Added <unsigned> to std::min.
+        (WebCore::createGlobalImageFileDescriptor): Added <int> to std::min.
+
 2013-06-28  Alex Christensen  <achristensen@apple.com>
 
         Added WebGL files to Windows build.

Source/WebCore/platform/win/PasteboardWin.cpp

@@ -677,7 +677,7 @@ void Pasteboard::writeURLToDataObject(const KURL& kurl, const String& titleStr,
     fgd->fgd[0].dwFlags = FD_FILESIZE;
     fgd->fgd[0].nFileSizeLow = content.length();
 
-    unsigned maxSize = std::min(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
+    unsigned maxSize = std::min<unsigned>(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
     CopyMemory(fgd->fgd[0].cFileName, fsPath.characters(), maxSize * sizeof(UChar));
     GlobalUnlock(urlFileDescriptor);
 
@@ -929,7 +929,7 @@ static HGLOBAL createGlobalImageFileDescriptor(const String& url, const String&
         return 0;
     }
 
-    int maxSize = std::min(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
+    int maxSize = std::min<int>(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
     CopyMemory(fgd->fgd[0].cFileName, (LPCWSTR)fsPath.characters(), maxSize * sizeof(UChar));
     GlobalUnlock(memObj);