Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Unified Diff: tests/Writer32Test.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/WritePixelsTest.cpp ('k') | tests/XfermodeTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/Writer32Test.cpp
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index d1366082ae4ff63ad694fcb06483fa3091dd0ad0..5849d731efba39ed0e83c82d22ef6a3e8f00ae0c 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -31,8 +31,8 @@ static void test_string_null(skiatest::Reporter* reporter) {
uint8_t storage[8];
SkWriter32 writer(storage, sizeof(storage));
- // Can we write NULL?
- writer.writeString(NULL);
+ // Can we write nullptr?
+ writer.writeString(nullptr);
const int32_t expected[] = { 0x0, 0x0 };
check_contents(reporter, writer, expected, sizeof(expected));
}
@@ -241,7 +241,7 @@ DEF_TEST(Writer32_contiguous, reporter) {
writer.reset(storage, sizeof(storage));
// This write is small enough to fit in storage, so it's contiguous.
test1(reporter, &writer);
- REPORTER_ASSERT(reporter, writer.contiguousArray() != NULL);
+ REPORTER_ASSERT(reporter, writer.contiguousArray() != nullptr);
// Everything other aspect of contiguous/non-contiguous is an
// implementation detail, not part of the public contract for
« no previous file with comments | « tests/WritePixelsTest.cpp ('k') | tests/XfermodeTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698