Skip to content

Commit a3da593

Browse files
[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): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@226619 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent fcb5461 commit a3da593

File tree

2 files changed

+10
-28
lines changed

2 files changed

+10
-28
lines changed

Tools/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2018-01-09 Yoshiaki Jitsukawa <[email protected]>
2+
3+
[Win] Remove workaround for Bug 176442 after stopping MSVC 2015 support
4+
https://bugs.webkit.org/show_bug.cgi?id=176443
5+
6+
Reviewed by Darin Adler.
7+
8+
* TestWebKitAPI/Tests/WTF/PriorityQueue.cpp:
9+
(TEST):
10+
111
2018-01-09 Frederic Wang <[email protected]>
212

313
check-webkit-style: Verify syntax for WK_API_AVAILABLE

Tools/TestWebKitAPI/Tests/WTF/PriorityQueue.cpp

-28
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ static T dequeue(PriorityQueue<T, isHigherPriority>& queue)
5656
TEST(WTF_PriorityQueue, Basic)
5757
{
5858
const unsigned numElements = 10;
59-
#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).
60-
PriorityQueue<unsigned, isLessThan<unsigned>> queue;
61-
#else
6259
PriorityQueue<unsigned> queue;
63-
#endif
6460

6561
EXPECT_EQ(0_z, queue.size());
6662
EXPECT_TRUE(queue.isEmpty());
@@ -80,11 +76,7 @@ TEST(WTF_PriorityQueue, Basic)
8076
TEST(WTF_PriorityQueue, CustomPriorityFunction)
8177
{
8278
const unsigned numElements = 10;
83-
#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).
84-
PriorityQueue<unsigned, isGreaterThan<unsigned>> queue;
85-
#else
8679
PriorityQueue<unsigned, &isGreaterThan<unsigned>> queue;
87-
#endif
8880

8981
EXPECT_EQ(0_z, queue.size());
9082
EXPECT_TRUE(queue.isEmpty());
@@ -114,11 +106,7 @@ struct CompareMove {
114106

115107
TEST(WTF_PriorityQueue, MoveOnly)
116108
{
117-
#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).
118-
PriorityQueue<MoveOnly, &CompareMove<isLessThan<unsigned>>::compare> queue;
119-
#else
120109
PriorityQueue<MoveOnly, &CompareMove<&isLessThan<unsigned>>::compare> queue;
121-
#endif
122110

123111
Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
124112
Vector<unsigned> sorted = values;
@@ -135,11 +123,7 @@ TEST(WTF_PriorityQueue, MoveOnly)
135123

136124
TEST(WTF_PriorityQueue, DecreaseKey)
137125
{
138-
#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).
139-
PriorityQueue<MoveOnly, &CompareMove<isLessThan<unsigned>>::compare> queue;
140-
#else
141126
PriorityQueue<MoveOnly, &CompareMove<&isLessThan<unsigned>>::compare> queue;
142-
#endif
143127

144128
Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
145129
Vector<unsigned> sorted = values;
@@ -165,11 +149,7 @@ TEST(WTF_PriorityQueue, DecreaseKey)
165149

166150
TEST(WTF_PriorityQueue, IncreaseKey)
167151
{
168-
#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).
169-
PriorityQueue<MoveOnly, &CompareMove<isGreaterThan<unsigned>>::compare> queue;
170-
#else
171152
PriorityQueue<MoveOnly, &CompareMove<&isGreaterThan<unsigned>>::compare> queue;
172-
#endif
173153

174154
Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
175155
Vector<unsigned> sorted = values;
@@ -195,11 +175,7 @@ TEST(WTF_PriorityQueue, IncreaseKey)
195175

196176
TEST(WTF_PriorityQueue, Iteration)
197177
{
198-
#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).
199-
PriorityQueue<MoveOnly, CompareMove<isGreaterThan<unsigned>>::compare> queue;
200-
#else
201178
PriorityQueue<MoveOnly, &CompareMove<&isGreaterThan<unsigned>>::compare> queue;
202-
#endif
203179

204180
Vector<unsigned> values = { 23, 54, 4, 8, 1, 2, 4, 0 };
205181
Vector<unsigned> sorted = values;
@@ -231,11 +207,7 @@ TEST(WTF_PriorityQueue, RandomActions)
231207
return randomNumber;
232208
};
233209

234-
#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).
235-
PriorityQueue<uint64_t, isLessThan<uint64_t>> queue;
236-
#else
237210
PriorityQueue<uint64_t> queue;
238-
#endif
239211
Vector<uint64_t> values;
240212

241213
enum Cases {

0 commit comments

Comments
 (0)