Changeset 135763 in webkit

Timestamp:

Nov 26, 2012 2:11:42 PM (11 years ago)

Author:

bfulgham@webkit.org

Message:

clipboardwin compile error for win64
​https://bugs.webkit.org/show_bug.cgi?id=94124

Patch by Alex Christensen <​alex.christensen@flexsim.com> on 2012-11-26
Reviewed by Brent Fulgham.

The clipboard utilities code uses std::min with one unsigned int parameter and one size_t parameter.
This causes a problem when compiling for 64-bit Windows because the two types are not the same size.
To resolve this issue, we specify the template type as the type the return value is being cast into

Fixed a few compile errors for Windows x64 by specifying template parameters.

• platform/win/ClipboardUtilitiesWin.cpp:

(WebCore::setFileDescriptorData): Specify the types for the std::min macro to avoid compiler errors
under 64-bit builds.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/ClipboardUtilitiesWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-26  Alex Christensen  <alex.christensen@flexsim.com>
+
+        clipboardwin compile error for win64
+        https://bugs.webkit.org/show_bug.cgi?id=94124
+
+        Reviewed by Brent Fulgham.
+
+        The clipboard utilities code uses std::min with one unsigned int parameter and one size_t parameter.
+        This causes a problem when compiling for 64-bit Windows because the two types are not the same size.
+        To resolve this issue, we specify the template type as the type the return value is being cast into
+
+        Fixed a few compile errors for Windows x64 by specifying template parameters.
+
+        * platform/win/ClipboardUtilitiesWin.cpp:
+        (WebCore::setFileDescriptorData): Specify the types for the std::min macro to avoid compiler errors
+        under 64-bit builds.
+
 2012-11-26  Arnaud Renevier  <a.renevier@sisa.samsung.com>
 

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

@@ -434 +434 @@
     fgd->fgd[0].nFileSizeLow = size;
 
-    int maxSize = std::min(pathname.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
+    int maxSize = std::min<int>(pathname.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
     CopyMemory(fgd->fgd[0].cFileName, pathname.charactersWithNullTermination(), maxSize * sizeof(UChar));
     GlobalUnlock(medium.hGlobal);