| Index: tests/RefDictTest.cpp
|
| diff --git a/tests/RefDictTest.cpp b/tests/RefDictTest.cpp
|
| index 469026ebc9f0e714be28b16ed19066ee828f953f..af30f86148c49af5e17c9d313ad37e1a31637ab4 100644
|
| --- a/tests/RefDictTest.cpp
|
| +++ b/tests/RefDictTest.cpp
|
| @@ -19,9 +19,9 @@ DEF_TEST(RefDict, reporter) {
|
| TestRC data0, data1;
|
| SkRefDict dict;
|
|
|
| - REPORTER_ASSERT(reporter, NULL == dict.find(NULL));
|
| - REPORTER_ASSERT(reporter, NULL == dict.find("foo"));
|
| - REPORTER_ASSERT(reporter, NULL == dict.find("bar"));
|
| + REPORTER_ASSERT(reporter, nullptr == dict.find(nullptr));
|
| + REPORTER_ASSERT(reporter, nullptr == dict.find("foo"));
|
| + REPORTER_ASSERT(reporter, nullptr == dict.find("bar"));
|
|
|
| dict.set("foo", &data0);
|
| REPORTER_ASSERT(reporter, &data0 == dict.find("foo"));
|
| @@ -36,8 +36,8 @@ DEF_TEST(RefDict, reporter) {
|
| REPORTER_ASSERT(reporter, data0.unique());
|
| REPORTER_ASSERT(reporter, !data1.unique());
|
|
|
| - dict.set("foo", NULL);
|
| - REPORTER_ASSERT(reporter, NULL == dict.find("foo"));
|
| + dict.set("foo", nullptr);
|
| + REPORTER_ASSERT(reporter, nullptr == dict.find("foo"));
|
| REPORTER_ASSERT(reporter, data0.unique());
|
| REPORTER_ASSERT(reporter, data1.unique());
|
|
|
| @@ -55,14 +55,14 @@ DEF_TEST(RefDict, reporter) {
|
| REPORTER_ASSERT(reporter, !data1.unique());
|
|
|
| dict.removeAll();
|
| - REPORTER_ASSERT(reporter, NULL == dict.find("foo"));
|
| - REPORTER_ASSERT(reporter, NULL == dict.find("bar"));
|
| + REPORTER_ASSERT(reporter, nullptr == dict.find("foo"));
|
| + REPORTER_ASSERT(reporter, nullptr == dict.find("bar"));
|
| REPORTER_ASSERT(reporter, data0.unique());
|
| REPORTER_ASSERT(reporter, data1.unique());
|
|
|
| {
|
| SkRefDict d;
|
| - REPORTER_ASSERT(reporter, NULL == d.find("foo"));
|
| + REPORTER_ASSERT(reporter, nullptr == d.find("foo"));
|
| REPORTER_ASSERT(reporter, data0.unique());
|
| d.set("foo", &data0);
|
| REPORTER_ASSERT(reporter, &data0 == d.find("foo"));
|
|
|