tests/TypefaceTest.cpp - Issue 1316233002: Style Change: NULL->nullptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tests/TypefaceTest.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:

Index: tests/TypefaceTest.cpp

diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp

index bb5d361bee956761fd4932d722992340fc8256d8..b3bc157eba81ed09fd1aadf98ffb63af49e172d8 100644

--- a/tests/TypefaceTest.cpp

+++ b/tests/TypefaceTest.cpp

@@ -10,7 +10,7 @@

DEF_TEST(Typeface, reporter) {

- SkAutoTUnref<SkTypeface> t1(SkTypeface::CreateFromName(NULL, SkTypeface::kNormal));

+ SkAutoTUnref<SkTypeface> t1(SkTypeface::CreateFromName(nullptr, SkTypeface::kNormal));

SkAutoTUnref<SkTypeface> t2(SkTypeface::RefDefault(SkTypeface::kNormal));

REPORTER_ASSERT(reporter, SkTypeface::Equal(t1.get(), t2.get()));

@@ -21,6 +21,6 @@ DEF_TEST(Typeface, reporter) {

#ifdef SK_BUILD_FOR_ANDROID

SkAutoTUnref<SkTypeface> t3(SkTypeface::CreateFromName("non-existent-font", SkTypeface::kNormal));

- REPORTER_ASSERT(reporter, NULL == t3.get());

+ REPORTER_ASSERT(reporter, nullptr == t3.get());

#endif

}

« no previous file with comments | « tests/TextureCompressionTest.cpp ('k') | tests/UtilsTest.cpp » ('j') | no next file with comments »