From 96fcdcc219d2a0d3579719b84b28bede76efba64 Mon Sep 17 00:00:00 2001 From: halcanary Date: Thu, 27 Aug 2015 07:41:13 -0700 Subject: Style Change: NULL->nullptr DOCS_PREVIEW= https://skia.org/?cl=1316233002 Review URL: https://codereview.chromium.org/1316233002 --- gm/gm_expectations.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gm/gm_expectations.h') diff --git a/gm/gm_expectations.h b/gm/gm_expectations.h index 029a533c62..6767b90f51 100644 --- a/gm/gm_expectations.h +++ b/gm/gm_expectations.h @@ -147,10 +147,10 @@ namespace skiagm { * If this Expectation is based on a single SkBitmap, return a * pointer to that SkBitmap. Otherwise (if the Expectation is * empty, or if it was based on a list of checksums rather - * than a single bitmap), returns NULL. + * than a single bitmap), returns nullptr. */ const SkBitmap *asBitmap() const { - return (kUnknown_SkColorType == fBitmap.colorType()) ? NULL : &fBitmap; + return (kUnknown_SkColorType == fBitmap.colorType()) ? nullptr : &fBitmap; } /** -- cgit v1.2.3