[webkit-changes] [221666] trunk/Tools

Wed, 06 Sep 2017 00:24:07 -0700

Title: [221666] trunk/Tools
Revision
221666
Author
[email protected]
Date
2017-09-06 00:23:38 -0700 (Wed, 06 Sep 2017)

Log 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 <[email protected]> on 2017-09-06
Reviewed by Keith Miller.

* TestWebKitAPI/Tests/WTF/PriorityQueue.cpp:
(TEST):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (221665 => 221666)


--- trunk/Tools/ChangeLog	2017-09-06 06:48:49 UTC (rev 221665)
+++ trunk/Tools/ChangeLog	2017-09-06 07:23:38 UTC (rev 221666)
@@ -1,3 +1,13 @@
+2017-09-06  Yoshiaki Jitsukawa  <[email protected]>
+
+        [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  <[email protected]>
 
         Fix a few minor problems found while working toward removing unneeded calls to updateStyle

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp (221665 => 221666)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp	2017-09-06 06:48:49 UTC (rev 221665)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp	2017-09-06 07:23:38 UTC (rev 221666)
@@ -56,7 +56,11 @@
 TEST(WTF_PriorityQueue, Basic)
 {
     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());
     EXPECT_TRUE(queue.isEmpty());
@@ -76,7 +80,11 @@
 TEST(WTF_PriorityQueue, CustomPriorityFunction)
 {
     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());
     EXPECT_TRUE(queue.isEmpty());
@@ -106,7 +114,11 @@
 
 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 };
     Vector<unsigned> sorted = values;
@@ -123,7 +135,11 @@
 
 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 };
     Vector<unsigned> sorted = values;
@@ -149,7 +165,11 @@
 
 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 };
     Vector<unsigned> sorted = values;
@@ -175,7 +195,11 @@
 
 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 };
     Vector<unsigned> sorted = values;
@@ -207,7 +231,11 @@
         return randomNumber;
     };
 
+#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;
 
     enum Cases {

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to