Changeset 118643 in webkit

Timestamp:

May 27, 2012, 7:26:35 PM (14 years ago)

Author:

yosin@chromium.org

Message:

[WTF] Introduce UINT64_C to MathExtras.h
​https://bugs.webkit.org/show_bug.cgi?id=87485

Reviewed by Kent Tamura.

Source/WebCore:

This patch introduces UINT64_C for all platforms to avoid using
conditional compilation.

No new tests. This patch doesn't change behavior.

• Modules/websockets/WebSocketFrame.cpp:

(WebCore::WebSocketFrame::parseFrame): Replace conditional compilation with UINT64_C.

Source/WTF:

• wtf/MathExtras.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/MathExtras.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/websockets/WebSocketFrame.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-05-27  Yoshifumi Inoue  <yosin@chromium.org>
+
+        [WTF] Introduce UINT64_C to MathExtras.h
+        https://bugs.webkit.org/show_bug.cgi?id=87485
+
+        Reviewed by Kent Tamura.
+
+        * wtf/MathExtras.h:
+
 2012-05-25  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/MathExtras.h

@@ -303 +303 @@
 #endif
 
+#ifndef UINT64_C
+#if COMPILER(MSVC)
+#define UINT64_C(c) c ## ui64
+#else
+#define UINT64_C(c) c ## ull
+#endif
+#endif
+
 
 // decompose 'number' to its sign, exponent, and mantissa components.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-27  Yoshifumi Inoue  <yosin@chromium.org>
+
+        [WTF] Introduce UINT64_C to MathExtras.h
+        https://bugs.webkit.org/show_bug.cgi?id=87485
+
+        Reviewed by Kent Tamura.
+
+        This patch introduces UINT64_C for all platforms to avoid using
+        conditional compilation.
+
+        No new tests. This patch doesn't change behavior.
+
+        * Modules/websockets/WebSocketFrame.cpp:
+        (WebCore::WebSocketFrame::parseFrame): Replace conditional compilation with UINT64_C.
+
 2012-05-27  Luke Macpherson  <macpherson@chromium.org>
 

trunk/Source/WebCore/Modules/websockets/WebSocketFrame.cpp

@@ -28 +28 @@
 
 #include <wtf/CryptographicallyRandomNumber.h>
+#include <wtf/MathExtras.h>
 
 using namespace std;
@@ -95 +96 @@
     }
 
-    // FIXME: UINT64_C(0x7FFFFFFFFFFFFFFF) should be used but it did not compile on Qt bots.
-#if COMPILER(MSVC)
-    static const uint64_t maxPayloadLength = 0x7FFFFFFFFFFFFFFFui64;
-#else
-    static const uint64_t maxPayloadLength = 0x7FFFFFFFFFFFFFFFull;
-#endif
+    static const uint64_t maxPayloadLength = UINT64_C(0x7FFFFFFFFFFFFFFF);
     size_t maskingKeyLength = masked ? maskingKeyWidthInBytes : 0;
     if (payloadLength64 > maxPayloadLength || payloadLength64 + maskingKeyLength > numeric_limits<size_t>::max()) {