Title: [152193] trunk/Source/WebCore
- Revision
- 152193
- Author
- [email protected]
- Date
- 2013-06-28 15:48:13 -0700 (Fri, 28 Jun 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152192 => 152193)
--- trunk/Source/WebCore/ChangeLog 2013-06-28 22:43:33 UTC (rev 152192)
+++ trunk/Source/WebCore/ChangeLog 2013-06-28 22:48:13 UTC (rev 152193)
@@ -1,5 +1,16 @@
2013-06-28 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
Added WebGL files to Windows build.
https://bugs.webkit.org/show_bug.cgi?id=118200
Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (152192 => 152193)
--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2013-06-28 22:43:33 UTC (rev 152192)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2013-06-28 22:48:13 UTC (rev 152193)
@@ -677,7 +677,7 @@
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 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
