diff options
| author |  bsalomon <bsalomon@google.com> | 2014-09-05 13:34:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-05 13:34:00 -0700 |
| commit | 49f085dddff10473b6ebf832a974288300224e60 (patch) | |
| tree | 308a3cac5e1fb053c9e27e7d07213d72eaa05409 /tests/DequeTest.cpp | |
| parent | 7260d7292bde966f038b8e166f3fe41ddd8f2099 (diff) | |
"NULL !=" = NULL
R=reed@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/544233002
Diffstat (limited to 'tests/DequeTest.cpp')
| -rw-r--r-- | tests/DequeTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/DequeTest.cpp b/tests/DequeTest.cpp index 5d5dc09176..04b1f4010e 100644 --- a/tests/DequeTest.cpp +++ b/tests/DequeTest.cpp @@ -19,8 +19,8 @@ static void assert_count(skiatest::Reporter* reporter, const SkDeque& deq, int c REPORTER_ASSERT(reporter, !deq.empty()); REPORTER_ASSERT(reporter, count == deq.count()); REPORTER_ASSERT(reporter, sizeof(int) == deq.elemSize()); - REPORTER_ASSERT(reporter, NULL != deq.front()); - REPORTER_ASSERT(reporter, NULL != deq.back()); + REPORTER_ASSERT(reporter, deq.front()); + REPORTER_ASSERT(reporter, deq.back()); if (1 == count) { REPORTER_ASSERT(reporter, deq.back() == deq.front()); } else { @@ -36,7 +36,7 @@ static void assert_iter(skiatest::Reporter* reporter, const SkDeque& deq, void* ptr; int value = max; - while (NULL != (ptr = iter.next())) { + while ((ptr = iter.next())) { REPORTER_ASSERT(reporter, value == *(int*)ptr); value -= 1; } @@ -46,7 +46,7 @@ static void assert_iter(skiatest::Reporter* reporter, const SkDeque& deq, iter.reset(deq, SkDeque::Iter::kBack_IterStart); value = min; - while (NULL != (ptr = iter.prev())) { + while ((ptr = iter.prev())) { REPORTER_ASSERT(reporter, value == *(int*)ptr); value += 1; } @@ -57,12 +57,12 @@ static void assert_iter(skiatest::Reporter* reporter, const SkDeque& deq, value = max; // forward iteration half-way - for (int i = 0; i < deq.count()/2 && NULL != (ptr = iter.next()); i++) { + for (int i = 0; i < deq.count()/2 && (ptr = iter.next()); i++) { REPORTER_ASSERT(reporter, value == *(int*)ptr); value -= 1; } // then back down w/ reverse iteration - while (NULL != (ptr = iter.prev())) { + while ((ptr = iter.prev())) { REPORTER_ASSERT(reporter, value == *(int*)ptr); value += 1; } |