Changeset 220567 in webkit

Timestamp:

Aug 10, 2017 5:36:24 PM (7 years ago)

Author:

Yusuke Suzuki

Message:

Unreviewed, attempt to fix build failure with VC2017

Source/WTF:

• wtf/PriorityQueue.h:

Tools:

• TestWebKitAPI/Tests/WTF/PriorityQueue.cpp:

(TEST):

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/PriorityQueue.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp (modified) (5 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2017-08-10  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, attempt to fix build failure with VC2017
+
+        * wtf/PriorityQueue.h:
+
 2017-08-10  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WTF/wtf/PriorityQueue.h

@@ -38 +38 @@
 // 3) It has in-place decrease/increaseKey methods, although they are still O(n) rather than O(log(n)).
 
-template<typename T, bool (*isHigherPriority)(const T&, const T&) = isLessThan<T>, size_t inlineCapacity = 0>
+template<typename T, bool (*isHigherPriority)(const T&, const T&) = &isLessThan<T>, size_t inlineCapacity = 0>
 class PriorityQueue {
     using BufferType = Vector<T, inlineCapacity>;

trunk/Tools/ChangeLog

@@ +1 @@
+2017-08-10  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, attempt to fix build failure with VC2017
+
+        * TestWebKitAPI/Tests/WTF/PriorityQueue.cpp:
+        (TEST):
+
 2017-08-10  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp

@@ -77 +77 @@
 {
     const unsigned numElements = 10;
-    PriorityQueue<unsigned, isGreaterThan<unsigned>> queue;
+    PriorityQueue<unsigned, &isGreaterThan<unsigned>> queue;
 
     EXPECT_EQ(0_z, queue.size());
@@ -107 +107 @@
 TEST(WTF_PriorityQueue, MoveOnly)
 {
-    PriorityQueue<MoveOnly, CompareMove<isLessThan<unsigned>>::compare> queue;
+    PriorityQueue<MoveOnly, &CompareMove<&isLessThan<unsigned>>::compare> queue;
 
     Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
@@ -124 +124 @@
 TEST(WTF_PriorityQueue, DecreaseKey)
 {
-    PriorityQueue<MoveOnly, CompareMove<isLessThan<unsigned>>::compare> queue;
+    PriorityQueue<MoveOnly, &CompareMove<&isLessThan<unsigned>>::compare> queue;
 
     Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
@@ -150 +150 @@
 TEST(WTF_PriorityQueue, IncreaseKey)
 {
-    PriorityQueue<MoveOnly, CompareMove<isGreaterThan<unsigned>>::compare> queue;
+    PriorityQueue<MoveOnly, &CompareMove<&isGreaterThan<unsigned>>::compare> queue;
 
     Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
@@ -176 +176 @@
 TEST(WTF_PriorityQueue, Iteration)
 {
-    PriorityQueue<MoveOnly, CompareMove<isGreaterThan<unsigned>>::compare> queue;
+    PriorityQueue<MoveOnly, &CompareMove<&isGreaterThan<unsigned>>::compare> queue;
 
     Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };