Changeset 221666 in webkit

Timestamp:

Sep 6, 2017 12:23:38 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[Win] Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp fails to compile with MSVC 2015
​https://bugs.webkit.org/show_bug.cgi?id=176442

Patch by Yoshiaki Jitsukawa <​Yoshiaki.Jitsukawa@sony.com> on 2017-09-06
Reviewed by Keith Miller.

• TestWebKitAPI/Tests/WTF/PriorityQueue.cpp:

(TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WTF/PriorityQueue.cpp (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-09-06  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [Win] Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp fails to compile with MSVC 2015
+        https://bugs.webkit.org/show_bug.cgi?id=176442
+
+        Reviewed by Keith Miller.
+
+        * TestWebKitAPI/Tests/WTF/PriorityQueue.cpp:
+        (TEST):
+
 2017-09-05  Darin Adler  <darin@apple.com>
 

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

@@ -57 +57 @@
 {
     const unsigned numElements = 10;
+#if defined(_MSC_VER) && _MSC_VER < 1910 // FIXME: Remove this workaround after we drop MSVC 2015 support (https://bugs.webkit.org/show_bug.cgi?id=176443).
+    PriorityQueue<unsigned, isLessThan<unsigned>> queue;
+#else
     PriorityQueue<unsigned> queue;
+#endif
 
     EXPECT_EQ(0_z, queue.size());
@@ -77 +81 @@
 {
     const unsigned numElements = 10;
+#if defined(_MSC_VER) && _MSC_VER < 1910 // FIXME: Remove this workaround after we drop MSVC 2015 support (https://bugs.webkit.org/show_bug.cgi?id=176443).
+    PriorityQueue<unsigned, isGreaterThan<unsigned>> queue;
+#else
     PriorityQueue<unsigned, &isGreaterThan<unsigned>> queue;
+#endif
 
     EXPECT_EQ(0_z, queue.size());
@@ -107 +115 @@
 TEST(WTF_PriorityQueue, MoveOnly)
 {
+#if defined(_MSC_VER) && _MSC_VER < 1910 // FIXME: Remove this workaround after we drop MSVC 2015 support (https://bugs.webkit.org/show_bug.cgi?id=176443).
+    PriorityQueue<MoveOnly, &CompareMove<isLessThan<unsigned>>::compare> queue;
+#else
     PriorityQueue<MoveOnly, &CompareMove<&isLessThan<unsigned>>::compare> queue;
+#endif
 
     Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
@@ -124 +136 @@
 TEST(WTF_PriorityQueue, DecreaseKey)
 {
+#if defined(_MSC_VER) && _MSC_VER < 1910 // FIXME: Remove this workaround after we drop MSVC 2015 support (https://bugs.webkit.org/show_bug.cgi?id=176443).
+    PriorityQueue<MoveOnly, &CompareMove<isLessThan<unsigned>>::compare> queue;
+#else
     PriorityQueue<MoveOnly, &CompareMove<&isLessThan<unsigned>>::compare> queue;
+#endif
 
     Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
@@ -150 +166 @@
 TEST(WTF_PriorityQueue, IncreaseKey)
 {
+#if defined(_MSC_VER) && _MSC_VER < 1910 // FIXME: Remove this workaround after we drop MSVC 2015 support (https://bugs.webkit.org/show_bug.cgi?id=176443).
+    PriorityQueue<MoveOnly, &CompareMove<isGreaterThan<unsigned>>::compare> queue;
+#else
     PriorityQueue<MoveOnly, &CompareMove<&isGreaterThan<unsigned>>::compare> queue;
+#endif
 
     Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
@@ -176 +196 @@
 TEST(WTF_PriorityQueue, Iteration)
 {
+#if defined(_MSC_VER) && _MSC_VER < 1910 // FIXME: Remove this workaround after we drop MSVC 2015 support (https://bugs.webkit.org/show_bug.cgi?id=176443).
+    PriorityQueue<MoveOnly, CompareMove<isGreaterThan<unsigned>>::compare> queue;
+#else
     PriorityQueue<MoveOnly, &CompareMove<&isGreaterThan<unsigned>>::compare> queue;
+#endif
 
     Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
@@ -208 +232 @@
     };
 
+#if defined(_MSC_VER) && _MSC_VER < 1910 // FIXME: Remove this workaround after we drop MSVC 2015 support (https://bugs.webkit.org/show_bug.cgi?id=176443).
+    PriorityQueue<uint64_t, isLessThan<uint64_t>> queue;
+#else
     PriorityQueue<uint64_t> queue;
+#endif
     Vector<uint64_t> values;