Changeset 199133 in webkit

Timestamp:

Apr 6, 2016 6:46:53 PM (8 years ago)

Author:

Simon Fraser

Message:

Fix Windows build by converting clampToInteger() into a template that only
takes integral types.

• wtf/MathExtras.h:

(clampToInteger):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MathExtras.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-04-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix Windows build by converting clampToInteger() into a template that only
+        takes integral types.
+
+        * wtf/MathExtras.h:
+        (clampToInteger):
+
 2016-04-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WTF/wtf/MathExtras.h

@@ -182 +182 @@
 }
 
-inline int clampToInteger(unsigned x)
-{
-    const unsigned intMax = static_cast<unsigned>(std::numeric_limits<int>::max());
-
-    if (x >= intMax)
-        return std::numeric_limits<int>::max();
-    return static_cast<int>(x);
-}
-
-inline int clampToInteger(size_t x)
-{
-    const size_t intMax = static_cast<size_t>(std::numeric_limits<int>::max());
+template<typename T>
+inline int clampToInteger(T x)
+{
+    static_assert(std::numeric_limits<T>::is_integer, "T must be an integer.");
+
+    const T intMax = static_cast<unsigned>(std::numeric_limits<int>::max());
 
     if (x >= intMax)