Changeset 152193 in webkit

Timestamp:

Jun 28, 2013 3:48:13 PM (11 years ago)

Author:

achristensen@apple.com

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/PasteboardWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/win/PasteboardWin.cpp

@@ -678 +678 @@
     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);
@@ -930 +930 @@
     }
 
-    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);