[webkit-changes] [226619] trunk/Tools

Tue, 09 Jan 2018 01:30:07 -0800

Title: [226619] trunk/Tools
Revision
226619
Author
[email protected]
Date
2018-01-09 01:29:52 -0800 (Tue, 09 Jan 2018)

Log Message

[Win] Remove workaround for Bug 176442 after stopping MSVC 2015 support
https://bugs.webkit.org/show_bug.cgi?id=176443

Patch by Yoshiaki Jitsukawa <[email protected]> on 2018-01-09
Reviewed by Darin Adler.

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

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (226618 => 226619)


--- trunk/Tools/ChangeLog	2018-01-09 09:05:34 UTC (rev 226618)
+++ trunk/Tools/ChangeLog	2018-01-09 09:29:52 UTC (rev 226619)
@@ -1,3 +1,13 @@
+2018-01-09  Yoshiaki Jitsukawa  <[email protected]>
+
+        [Win] Remove workaround for Bug 176442 after stopping MSVC 2015 support
+        https://bugs.webkit.org/show_bug.cgi?id=176443
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WTF/PriorityQueue.cpp:
+        (TEST):
+
 2018-01-09  Frederic Wang  <[email protected]>
 
         check-webkit-style: Verify syntax for WK_API_AVAILABLE

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp (226618 => 226619)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp	2018-01-09 09:05:34 UTC (rev 226618)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp	2018-01-09 09:29:52 UTC (rev 226619)
@@ -56,11 +56,7 @@
 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());
@@ -80,11 +76,7 @@
 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());
@@ -114,11 +106,7 @@
 
 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;
@@ -135,11 +123,7 @@
 
 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;
@@ -165,11 +149,7 @@
 
 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;
@@ -195,11 +175,7 @@
 
 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;
@@ -231,11 +207,7 @@
         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