Changeset 246670 in webkit

Timestamp:

Jun 20, 2019 10:19:27 PM (5 years ago)

Author:

Fujii Hironori

Message:

Try to use C++14 std::enable_if_t in CheckedArithmetic.h again
​https://bugs.webkit.org/show_bug.cgi?id=199099

Reviewed by Ross Kirsling.

r242235 changed CheckedArithmetic to not use C++14. Let's try
C++14 again.

• wtf/CheckedArithmetic.h: Use C++14 std::make_unsigned_t and std::enable_if_t.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/CheckedArithmetic.h (modified) (5 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-06-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Try to use C++14 std::enable_if_t in CheckedArithmetic.h again
+        https://bugs.webkit.org/show_bug.cgi?id=199099
+
+        Reviewed by Ross Kirsling.
+
+        r242235 changed CheckedArithmetic to not use C++14. Let's try
+        C++14 again.
+
+        * wtf/CheckedArithmetic.h: Use C++14 std::make_unsigned_t and std::enable_if_t.
+
 2019-06-18  Darin Adler  <darin@apple.com>
 

trunk/Source/WTF/wtf/CheckedArithmetic.h

@@ -182 +182 @@
         // When converting value to unsigned Source, value will become a big value if value is negative.
         // Casted value will become bigger than Target::max as Source is bigger than Target.
-        return static_cast<typename std::make_unsigned<Source>::type>(value) <= std::numeric_limits<Target>::max();
+        return static_cast<std::make_unsigned_t<Source>>(value) <= std::numeric_limits<Target>::max();
     }
 };
@@ -542 +542 @@
 };
 
-template <class OverflowHandler, typename = typename std::enable_if<!std::is_scalar<OverflowHandler>::value>::type>
+template <class OverflowHandler, typename = std::enable_if_t<!std::is_scalar<OverflowHandler>::value>>
 inline constexpr bool observesOverflow() { return true; }
 
@@ -554 +554 @@
 }
 
-template <class OverflowHandler, typename U, typename V, typename R, typename = typename std::enable_if<!std::is_scalar<OverflowHandler>::value>::type>
+template <class OverflowHandler, typename U, typename V, typename R, typename = std::enable_if_t<!std::is_scalar<OverflowHandler>::value>>
 static inline bool safeAdd(U lhs, V rhs, R& result)
 {
@@ -568 +568 @@
 }
 
-template <class OverflowHandler, typename U, typename V, typename R, typename = typename std::enable_if<!std::is_scalar<OverflowHandler>::value>::type>
+template <class OverflowHandler, typename U, typename V, typename R, typename = std::enable_if_t<!std::is_scalar<OverflowHandler>::value>>
 static inline bool safeSub(U lhs, V rhs, R& result)
 {
@@ -582 +582 @@
 }
 
-template <class OverflowHandler, typename U, typename V, typename R, typename = typename std::enable_if<!std::is_scalar<OverflowHandler>::value>::type>
+template <class OverflowHandler, typename U, typename V, typename R, typename = std::enable_if_t<!std::is_scalar<OverflowHandler>::value>>
 static inline bool safeMultiply(U lhs, V rhs, R& result)
 {